From 3a38a7a4acaaf4984eb538c59ac9c332bd468a42 Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Mon, 15 Jul 2024 19:11:39 +0200 Subject: [PATCH 01/33] New wolfssl v5.7.2-stable --- extra/wolfssl/wolfssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl index 8970ff4c340..00e42151ca0 160000 --- a/extra/wolfssl/wolfssl +++ b/extra/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 8970ff4c34034dbb3594943d11f8c9d4c5512bd5 +Subproject commit 00e42151ca061463ba6a95adb2290f678cbca472 From 26192a4665f12e88f55858364b2c7ec372c280f0 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 16 Jul 2024 09:30:20 +0200 Subject: [PATCH 02/33] MDEV-33265 mariadb-secure-installation fails with --defaults-group-suffix Reason for the error is that --defaults-group-suffix is passed twice to the command line client, and option parser is not prepared for this. Double occurence of comes from 2 invocations of parse_arguments(), which appends unparsed arguments each time it is called. Fixed by treating --defaults-group-suffix like other "--defaults-" (--defaults-file/--defaults-extra-file). it will be parsed, and thus passed only once to the command line client. --- scripts/mysql_secure_installation.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index b2a9edf4953..7a0611070cc 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -27,6 +27,7 @@ echo_c= basedir= defaults_file= defaults_extra_file= +defaults_group_suffix= no_defaults= parse_arg() @@ -52,6 +53,7 @@ parse_arguments() --basedir=*) basedir=`parse_arg "$arg"` ;; --defaults-file=*) defaults_file="$arg" ;; --defaults-extra-file=*) defaults_extra_file="$arg" ;; + --defaults-group-suffix=*) defaults_group_suffix="$arg" ;; --no-defaults) no_defaults="$arg" ;; *) if test -n "$pick_args" @@ -184,7 +186,7 @@ fi # Now we can get arguments from the group [client] and [client-server] # in the my.cfg file, then re-run to merge with command line arguments. -parse_arguments `$print_defaults $defaults_file $defaults_extra_file $no_defaults client client-server client-mariadb` +parse_arguments `$print_defaults $defaults_file $defaults_extra_file $defaults_group_suffix $no_defaults client client-server client-mariadb` parse_arguments PICK-ARGS-FROM-ARGV "$@" set_echo_compat() { From 653050ac8495180bd18599756fc652471c155cfe Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Mon, 1 Jul 2024 17:41:23 +0800 Subject: [PATCH 03/33] MDEV-32492 MDEV-29676 Spider: some code documentation and cleanup Some documentations come from commit for MDEV-29676, and the rest are mainly related to SPIDER_TRX_HA. Removed SPIDER_TRX_HA::trx as it is unused. --- storage/spider/ha_spider.h | 4 +++- storage/spider/spd_conn.cc | 31 ++++++++++++++++++++++++++ storage/spider/spd_include.h | 43 ++++++++++++++++++++++++++++++++---- storage/spider/spd_trx.cc | 8 ++++++- 4 files changed, 80 insertions(+), 6 deletions(-) diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h index 54e14760bcf..cfd51d7280d 100644 --- a/storage/spider/ha_spider.h +++ b/storage/spider/ha_spider.h @@ -67,8 +67,10 @@ public: char *conn_keys_first_ptr; char **conn_keys; SPIDER_CONN **conns; - /* for active-standby mode */ + /* array of indexes of active servers */ uint *conn_link_idx; + /* A bitmap indicating whether each active server have some higher + numbered server in the same "group" left to try (can fail over) */ uchar *conn_can_fo; void **quick_targets; int *need_mons; diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc index 1ac0c8f9b73..453e0aaf709 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc @@ -3958,6 +3958,24 @@ void *spider_bg_mon_action( } #endif +/** + Returns a random (active) server with a maximum required link status + + Calculate the sum of balances of all servers whose link status is at + most the specified status ("eligible"), generate a random number + less than this balance, then find the first server cumulatively + exceeding this balance + + @param thd Connection used for generating a random number + @param link_statuses The link statuses of servers + @param access_balances The access balances of servers + @param conn_link_idx Array of indexes to servers + @param link_count Number of servers + @param link_status The maximum required link status + @retval Index to the found server + @retval -1 if no eligible servers + @retval -2 if out of memory +*/ int spider_conn_first_link_idx( THD *thd, long *link_statuses, @@ -4053,6 +4071,17 @@ int spider_conn_next_link_idx( DBUG_RETURN(tmp_link_idx); } +/** + Finds the next active server with a maximum required link status + + @param link_statuses The statuses of servers + @param conn_link_idx The array of active servers + @param link_idx The index of the current active server + @param link_count The number of active servers + @param link_status The required maximum link status + @return The next active server whose link status is + at most the required one. +*/ int spider_conn_link_idx_next( long *link_statuses, uint *conn_link_idx, @@ -4065,6 +4094,8 @@ int spider_conn_link_idx_next( link_idx++; if (link_idx >= link_count) break; + /* Asserts that the `link_idx`th active server is in the correct + "group" */ DBUG_ASSERT((conn_link_idx[link_idx] - link_idx) % link_count == 0); } while (link_statuses[conn_link_idx[link_idx]] > link_status); DBUG_PRINT("info",("spider link_idx=%d", link_idx)); diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index 09482b276e8..6b9e2998144 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -1023,15 +1023,24 @@ typedef struct st_spider_share char *table_name; uint table_name_length; uint use_count; + /** + Probably equals `active_link_count`. See also commit ddff602 of + https://github.com/nayuta-yanagisawa/spider-history + + FIXME: consider removing it and using `active_link_count` instead. + */ uint link_count; + /* Number of all links, i.e. all remote servers for the spider + table. */ uint all_link_count; + /* + The bitmap size of ha_spider::conn_can_fo, where the ha_spider + is the one `this' associates with (i.e. spider->share == this) + */ uint link_bitmap_size; pthread_mutex_t mutex; pthread_mutex_t sts_mutex; pthread_mutex_t crd_mutex; -/* - pthread_mutex_t auto_increment_mutex; -*/ TABLE_SHARE *table_share; SPIDER_LGTM_TBLHND_SHARE *lgtm_tblhnd_share; #ifdef SPIDER_HAS_HASH_VALUE_TYPE @@ -1574,16 +1583,42 @@ public: ulong sort; }; +/* + A SPIDER_TRX_HA contains the HA information of a spider table or + partition. + + Each SPIDER_TRX_HA is stored in a hash belonging to a SPIDER_TRX + i.e. its trx_ha_hash field. + + It thus may have a different lifespan from the ha_spider or + SPIDER_SHARE associated with the same spider table/partition. +*/ typedef struct st_spider_trx_ha { + /* + A fully qualified table name, used as the key in + SPIDER_TRX::trx_ha_hash + */ char *table_name; uint table_name_length; - SPIDER_TRX *trx; + /* + The associated SPIDER_SHARE. Will be used to check against a + given SPIDER_SHARE + */ SPIDER_SHARE *share; + /* + link_count and link_bitmap_size are read from and checked against + the corresponding fields of the associated SPIDER_SHARE. + */ uint link_count; uint link_bitmap_size; + /* + conn_link_idx and conn_can_fo are read from and written to the + corresponding fields of the associated ha_spider. + */ uint *conn_link_idx; uchar *conn_can_fo; + /* TODO: document */ bool wait_for_reusing; } SPIDER_TRX_HA; diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index 65bd6fc2120..56b22abdbf5 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -3767,6 +3767,13 @@ void spider_free_tmp_thd( DBUG_VOID_RETURN; } +/* + Check the info of a given SPIDER_TRX_HA with spider->share. If it + does not match or if the given SPIDER_TRX_HA is NULL, then create a + new one from spider and spider->share, and add the new SPIDER_TRX_HA + to trx->trx_ha_hash. On mismatch and non-NULL trx_ha, then it will + be removed from the hash and freed before the creation of a new one. +*/ int spider_create_trx_ha( SPIDER_TRX *trx, ha_spider *spider, @@ -3817,7 +3824,6 @@ int spider_create_trx_ha( memcpy(trx_ha->table_name, share->table_name, share->table_name_length); trx_ha->table_name[share->table_name_length] = '\0'; trx_ha->table_name_length = share->table_name_length; - trx_ha->trx = trx; trx_ha->share = share; trx_ha->link_count = share->link_count; trx_ha->link_bitmap_size = share->link_bitmap_size; From 14c40509923c156cab5ee7ebc457a943b485f03f Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Thu, 11 Jul 2024 13:48:48 +0800 Subject: [PATCH 04/33] MDEV-32492 Delete and remove trx_ha on spider share mismatch A SPIDER_TRX_HA associated with a SPIDER_TRX could have longer lifetime than its associated SPIDER_SHARE. And it is identified with the associated table name. When the SPIDER_SHARE no longer valid, e.g. when the associated spider table has been dropped and recreated, the SPIDER_TRX_HA should be reset too. Since spider could create a new SPIDER_SHARE with the exact same address of a freed SPIDER_SHARE, we try to mark all SPIDER_TRX_HAs associated with a SPIDER_SHARE invalid when the SPIDER_SHARE is about to be freed. --- storage/spider/ha_spider.cc | 20 ++++++ .../spider/bugfix/r/mdev_32492.result | 67 +++++++++++++++++++ .../spider/bugfix/t/mdev_32492.test | 62 +++++++++++++++++ storage/spider/spd_trx.cc | 25 +++++-- 4 files changed, 169 insertions(+), 5 deletions(-) create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_32492.result create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_32492.test diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 485b98eec84..d3ffe43ca52 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -584,6 +584,25 @@ error_wide_handler_alloc: DBUG_RETURN(error_num); } +/* + Given a SPIDER_SHARE that will be freed, update all SPIDER_TRX_HAs + of spider_current_trx to point to a NULL share, which will cause the + removal of the SPIDER_TRX_HA in spider_check_trx_ha(). +*/ +static void spider_update_current_trx_ha_with_freed_share(SPIDER_SHARE *share) +{ + SPIDER_TRX *trx= spider_current_trx; + if (trx) + { + for (uint i = 0; i < trx->trx_ha_hash.records; i++) + { + SPIDER_TRX_HA *trx_ha = (SPIDER_TRX_HA *) my_hash_element(&trx->trx_ha_hash, i); + if (trx_ha->share == share) + trx_ha->share= NULL; + } + } +} + int ha_spider::close() { int error_num = 0, roop_count, error_num2; @@ -711,6 +730,7 @@ int ha_spider::close() result_list.tmp_sqls = NULL; } + spider_update_current_trx_ha_with_freed_share(share); spider_free_share(share); is_clone = FALSE; pt_clone_source_handler = NULL; diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_32492.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_32492.result new file mode 100644 index 00000000000..6cf0e4ad0a8 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_32492.result @@ -0,0 +1,67 @@ +# +# MDEV-32492 SIGSEGV in spider_conn_first_link_idx on DELETE +# +for master_1 +for child2 +for child3 +set spider_same_server_link= 1; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); +CREATE TABLE t (c INT, PRIMARY KEY(c)) ENGINE=Spider; +SHOW CREATE TABLE t; +Table Create Table +t CREATE TABLE `t` ( + `c` int(11) NOT NULL, + PRIMARY KEY (`c`) +) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +Warnings: +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +DROP TABLE t; +CREATE TABLE t (c INT) ENGINE=Spider COMMENT='port "1 1"'; +DELETE FROM t; +ERROR HY000: Unable to connect to foreign data source: localhost +drop table t; +CREATE TABLE t1 (a INT,b VARCHAR(255),PRIMARY KEY(a)) ENGINE=Spider comment="srv 'srv', table 't1', read_only_mode '1'"; +INSERT INTO t1 VALUES (1,'aaa'),(2,'bbb'),(3,'ccc'),(4,'ddd'); +ERROR HY000: Table 'test.t1' is read only +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL, + `b` varchar(255) DEFAULT NULL, + PRIMARY KEY (`a`) +) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='srv ''srv'', table ''t1'', read_only_mode ''1''' +Warnings: +Error 12719 An infinite loop is detected when opening table test.t1 +DROP TABLE t1; +CREATE TABLE t1 (a INT) ENGINE=Spider comment="port '123 456'"; +INSERT IGNORE INTO t1 VALUES (42),(42); +ERROR HY000: Unable to connect to foreign data source: localhost +drop table t1; +CREATE TABLE t1 (c INT, KEY(c)) ENGINE=Spider COMMENT='WRAPPER "mysql", SRV "srv",TABLE "t2", PK_NAME "f"'; +SET GLOBAL general_log=1; +INSERT INTO t1 VALUES (1, "aaa"),(2, "bbb"),(3, "ccc"),(4, "ddd"); +ERROR 21S01: Column count doesn't match value count at row 1 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `c` int(11) DEFAULT NULL, + KEY `c` (`c`) +) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='WRAPPER "mysql", SRV "srv",TABLE "t2", PK_NAME "f"' +Warnings: +Error 12702 Remote table 'test.t2' is not found +DROP TABLE t1; +CREATE TABLE t1 (a INT) ENGINE=Spider comment='port "123 456"'; +SELECT * FROM t1; +ERROR HY000: Unable to connect to foreign data source: localhost +INSERT IGNORE INTO t1 VALUES (42),(42); +ERROR HY000: Unable to connect to foreign data source: localhost +drop table t1; +drop server srv; +for master_1 +for child2 +for child3 +# +# end of test mdev_32492 +# diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_32492.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_32492.test new file mode 100644 index 00000000000..13fc4fe64f8 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_32492.test @@ -0,0 +1,62 @@ +--echo # +--echo # MDEV-32492 SIGSEGV in spider_conn_first_link_idx on DELETE +--echo # +--disable_query_log +--disable_result_log +--source ../../t/test_init.inc +--enable_result_log +--enable_query_log + +set spider_same_server_link= 1; +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); + +CREATE TABLE t (c INT, PRIMARY KEY(c)) ENGINE=Spider; +--disable_ps_protocol +SHOW CREATE TABLE t; +--enable_ps_protocol +DROP TABLE t; +CREATE TABLE t (c INT) ENGINE=Spider COMMENT='port "1 1"'; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +DELETE FROM t; +drop table t; + +CREATE TABLE t1 (a INT,b VARCHAR(255),PRIMARY KEY(a)) ENGINE=Spider comment="srv 'srv', table 't1', read_only_mode '1'"; +--error 12518 +INSERT INTO t1 VALUES (1,'aaa'),(2,'bbb'),(3,'ccc'),(4,'ddd'); +--disable_ps_protocol +SHOW CREATE TABLE t1; +--enable_ps_protocol +DROP TABLE t1; +CREATE TABLE t1 (a INT) ENGINE=Spider comment="port '123 456'"; +# bug crash site +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +INSERT IGNORE INTO t1 VALUES (42),(42); +drop table t1; + +CREATE TABLE t1 (c INT, KEY(c)) ENGINE=Spider COMMENT='WRAPPER "mysql", SRV "srv",TABLE "t2", PK_NAME "f"'; +SET GLOBAL general_log=1; +--error ER_WRONG_VALUE_COUNT_ON_ROW +INSERT INTO t1 VALUES (1, "aaa"),(2, "bbb"),(3, "ccc"),(4, "ddd"); +--disable_ps_protocol +SHOW CREATE TABLE t1; +--enable_ps_protocol +DROP TABLE t1; +CREATE TABLE t1 (a INT) ENGINE=Spider comment='port "123 456"'; +# bug crash site +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +SELECT * FROM t1; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +INSERT IGNORE INTO t1 VALUES (42),(42); +drop table t1; + +drop server srv; + +--disable_query_log +--disable_result_log +--source ../../t/test_deinit.inc +--enable_result_log +--enable_query_log +--echo # +--echo # end of test mdev_32492 +--echo # diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index 56b22abdbf5..a97f476c53d 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -1092,6 +1092,7 @@ int spider_free_trx_alloc( DBUG_RETURN(0); } +/* Get or create a trx associated with the given THD. */ SPIDER_TRX *spider_get_trx( THD *thd, bool regist_allocated_thds, @@ -3863,6 +3864,11 @@ SPIDER_TRX_HA *spider_check_trx_ha( SPIDER_TRX_HA *trx_ha; SPIDER_SHARE *share = spider->share; DBUG_ENTER("spider_check_trx_ha"); + /* + Check for mismatch in trx_ha->share, link_count and + link_bitmap_size, which is an indication of a share that has been + freed. Delete the trx_ha and return NULL on mismatch. + */ #ifdef SPIDER_HAS_HASH_VALUE_TYPE if ((trx_ha = (SPIDER_TRX_HA *) my_hash_search_using_hash_value( &trx->trx_ha_hash, share->table_name_hash_value, @@ -3872,11 +3878,20 @@ SPIDER_TRX_HA *spider_check_trx_ha( (uchar*) share->table_name, share->table_name_length))) #endif { - memcpy(spider->conn_link_idx, trx_ha->conn_link_idx, - sizeof(uint) * share->link_count); - memcpy(spider->conn_can_fo, trx_ha->conn_can_fo, - sizeof(uint) * share->link_bitmap_size); - DBUG_RETURN(trx_ha); + if (trx_ha->share == share && trx_ha->link_count == share->link_count && + trx_ha->link_bitmap_size == share->link_bitmap_size) + { + memcpy(spider->conn_link_idx, trx_ha->conn_link_idx, + sizeof(uint) * share->link_count); + memcpy(spider->conn_can_fo, trx_ha->conn_can_fo, + sizeof(uint) * share->link_bitmap_size); + DBUG_RETURN(trx_ha); + } + else + { + my_hash_delete(&trx->trx_ha_hash, (uchar*) trx_ha); + spider_free(trx, trx_ha, MYF(0)); + } } DBUG_RETURN(NULL); } From 85a36958e35bc2d30edefc93638c1f7c62c69b40 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Mon, 8 Jul 2024 16:07:53 +0800 Subject: [PATCH 05/33] MDEV-27902 Some Spider code documentation regarding first_link_idx and remote HANDLER commands --- storage/spider/ha_spider.cc | 19 +++++++++++++++++++ storage/spider/ha_spider.h | 6 ++++++ storage/spider/spd_db_include.h | 1 + storage/spider/spd_trx.cc | 9 +++++++++ 4 files changed, 35 insertions(+) diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index d3ffe43ca52..3e90ae827a6 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -12918,6 +12918,15 @@ void ha_spider::sync_from_clone_source_base( DBUG_VOID_RETURN; } +/* + Set the initial values for each dbton_handler's first_link_idx and + strict_group_by. + + First, reset first_link_idx to -1. + Then, for each active remote server, if the corresponding + dbton_handler has not been set yet (first_link_idx == -1), set its + first_link_idx to be the index of the connection. +*/ void ha_spider::set_first_link_idx() { int roop_count, all_link_idx; @@ -12957,6 +12966,16 @@ void ha_spider::set_first_link_idx() DBUG_VOID_RETURN; } +/* + Reset the initial values for each dbton_handler's first_link_idx to + -1. + + Also, set the search_link_idx'th active server's first_link_idx to + search_link_idx. + + search_link_idx is commonly randomly set using + spider_conn_first_link_idx - see the commentary of that function. +*/ void ha_spider::reset_first_link_idx() { int all_link_idx; diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h index cfd51d7280d..1bde115de6c 100644 --- a/storage/spider/ha_spider.h +++ b/storage/spider/ha_spider.h @@ -167,7 +167,13 @@ public: ulonglong *db_request_id; uchar *db_request_phase; uchar *m_handler_opened; + /* ids for use in HANDLER command */ uint *m_handler_id; + /* + aliases for use in HANDLER command, in the format of t%5u on + m_handler_id. So for example, if m_handler_id is 3, then the + corresponding m_handler_cid is t00003 + */ char **m_handler_cid; #ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS bool do_direct_update; diff --git a/storage/spider/spd_db_include.h b/storage/spider/spd_db_include.h index 0632a816995..32cefbaa258 100644 --- a/storage/spider/spd_db_include.h +++ b/storage/spider/spd_db_include.h @@ -1135,6 +1135,7 @@ public: uint dbton_id; ha_spider *spider; spider_db_share *db_share; + /* Index of active server, used in query construction. */ int first_link_idx; bool strict_group_by= false; bool no_where_cond= false; diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index a97f476c53d..dabec76f4dd 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -3933,6 +3933,15 @@ void spider_reuse_trx_ha( DBUG_VOID_RETURN; } +/** + Sets link indices for load balancing read connections + + Assuming `spider->share->link_count` is the number of active servers + to use, this function updates `spider->conn_link_idx` with the first + server in the same "modulus group" whose link status is not + `SPIDER_LINK_STATUS_NG`, or if one cannot be found, use the + `link_idx`th server +*/ void spider_trx_set_link_idx_for_all( ha_spider *spider ) { From 696c2497fccc320b1f306758cdf6b24c97669509 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Mon, 8 Jul 2024 16:22:50 +0800 Subject: [PATCH 06/33] MDEV-27902 Spider check trx and get conn in rnd_next() This allows creation of SPIDER_CONN on demand, if the previous one was freed. Also, the first_link_idx's are reset during spider_check_trx_and_get_conn(), which in the case of remote HANDLER commands, might not match the link to use correct first_link_idx for remote HANDLER statement that was later set in ha_spider::rnd_handler_init() (causing testing regressions in the spider/handler suite). Therefore we fix the first_link_idx there. --- storage/spider/ha_spider.cc | 5 ++ .../spider/bugfix/r/mdev_27902.result | 55 ++++++++++++++++++ .../spider/bugfix/t/mdev_27902.test | 56 +++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_27902.result create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_27902.test diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 3e90ae827a6..b578226ae3d 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -7182,6 +7182,8 @@ int ha_spider::rnd_next( DBUG_RETURN(error_num); use_pre_call = FALSE; } + if ((error_num= spider_check_trx_and_get_conn(ha_thd(), this, FALSE))) + DBUG_RETURN(error_num); DBUG_RETURN(rnd_next_internal(buf)); } @@ -12553,6 +12555,9 @@ int ha_spider::rnd_handler_init() DBUG_RETURN(error_num); } set_handler_opened(roop_count); + spider_db_handler *dbton_hdl= + dbton_handler[share->sql_dbton_ids[conn_link_idx[roop_count]]]; + dbton_hdl->first_link_idx= roop_count; } } if (sql_kinds & SPIDER_SQL_KIND_HANDLER) diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_27902.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_27902.result new file mode 100644 index 00000000000..9b051274363 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_27902.result @@ -0,0 +1,55 @@ +# +# MDEV-27902 Crashes, asserts, hangs and corruptions in Spider when using HANDLER +# +for master_1 +for child2 +for child3 +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); +CREATE TABLE t (c INT) ENGINE=Spider; +HANDLER t OPEN; +Warnings: +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +HANDLER t READ next; +ERROR HY000: Unable to connect to foreign data source: localhost +dummy; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'dummy' at line 1 +HANDLER t READ next; +ERROR HY000: Unable to connect to foreign data source: localhost +drop table t; +CREATE TABLE t (c INT) ENGINE=Spider; +HANDLER t OPEN; +Warnings: +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +HANDLER t READ FIRST; +ERROR HY000: Unable to connect to foreign data source: localhost +HANDLER t READ NEXT; +ERROR HY000: Unable to connect to foreign data source: localhost +drop table t; +CREATE TABLE t (c INT) ENGINE=Spider; +HANDLER t OPEN; +Warnings: +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +Error 1429 Unable to connect to foreign data source: localhost +HANDLER t READ NEXT; +ERROR HY000: Unable to connect to foreign data source: localhost +SELECT * FROM t; +ERROR HY000: Unable to connect to foreign data source: localhost +HANDLER t READ NEXT; +ERROR HY000: Unable to connect to foreign data source: localhost +drop table t; +drop server srv; +for master_1 +for child2 +for child3 +# +# end of test mdev_27902 +# diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_27902.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_27902.test new file mode 100644 index 00000000000..2b46250ec33 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27902.test @@ -0,0 +1,56 @@ +--echo # +--echo # MDEV-27902 Crashes, asserts, hangs and corruptions in Spider when using HANDLER +--echo # +--disable_query_log +--disable_result_log +--source ../../t/test_init.inc +--enable_result_log +--enable_query_log + +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); + +# original case +CREATE TABLE t (c INT) ENGINE=Spider; +HANDLER t OPEN; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +HANDLER t READ next; +--error ER_PARSE_ERROR +dummy; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +HANDLER t READ next; + +drop table t; + +# case by nayuta +CREATE TABLE t (c INT) ENGINE=Spider; +HANDLER t OPEN; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +HANDLER t READ FIRST; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +HANDLER t READ NEXT; + +drop table t; + +# Another case by Roel +CREATE TABLE t (c INT) ENGINE=Spider; +HANDLER t OPEN; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +HANDLER t READ NEXT; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +SELECT * FROM t; +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +HANDLER t READ NEXT; + +drop table t; + +drop server srv; + +--disable_query_log +--disable_result_log +--source ../../t/test_deinit.inc +--enable_result_log +--enable_query_log +--echo # +--echo # end of test mdev_27902 +--echo # From 0bb9862888567a5304aec18e85bf6dd002fc25d3 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Fri, 5 Jul 2024 16:32:54 +0800 Subject: [PATCH 07/33] MDEV-29962 Spider: creates connections if needed before lock_tables() Same cause as MDEV-31996. This prevents reuse of conns freed previously, e.g. during the commit of previous statement. It does not occur in 10.4 because of the commit for MDEV-19002 removed the call to spider_check_trx_and_get_conn(). --- storage/spider/ha_spider.cc | 2 ++ .../spider/bugfix/r/mdev_29962.result | 23 ++++++++++++++ .../spider/bugfix/t/mdev_29962.test | 30 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_29962.result create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_29962.test diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index b578226ae3d..afa3732c577 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -1130,6 +1130,8 @@ int ha_spider::external_lock( } } + if ((error_num= spider_check_trx_and_get_conn(thd, this, FALSE))) + DBUG_RETURN(error_num); if (!partition_handler || !partition_handler->handlers) { DBUG_RETURN(lock_tables()); /* Non-partitioned table */ diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_29962.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_29962.result new file mode 100644 index 00000000000..0767df7d988 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_29962.result @@ -0,0 +1,23 @@ +# +# MDEV-29962 SIGSEGV in ha_spider::lock_tables on BEGIN after table lock +# +for master_1 +for child2 +for child3 +set spider_same_server_link= 1; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); +CREATE TABLE t (c INT) ENGINE=InnoDB; +CREATE TABLE t1 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"'; +SELECT * FROM t1; +c +LOCK TABLES t1 WRITE CONCURRENT,t1 AS t2 READ; +BEGIN; +drop table t, t1; +drop server srv; +for master_1 +for child2 +for child3 +# +# end of test mdev_29962 +# diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_29962.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_29962.test new file mode 100644 index 00000000000..65735d43e7d --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29962.test @@ -0,0 +1,30 @@ +--echo # +--echo # MDEV-29962 SIGSEGV in ha_spider::lock_tables on BEGIN after table lock +--echo # +--disable_query_log +--disable_result_log +--source ../../t/test_init.inc +--enable_result_log +--enable_query_log + +set spider_same_server_link= 1; +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); + +CREATE TABLE t (c INT) ENGINE=InnoDB; +CREATE TABLE t1 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "srv",TABLE "t"'; +SELECT * FROM t1; +LOCK TABLES t1 WRITE CONCURRENT,t1 AS t2 READ; +BEGIN; + +drop table t, t1; +drop server srv; + +--disable_query_log +--disable_result_log +--source ../../t/test_deinit.inc +--enable_result_log +--enable_query_log +--echo # +--echo # end of test mdev_29962 +--echo # From 132270d3de73163f0198c72e8352a388c69a1be5 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Thu, 11 Jul 2024 11:16:46 +0800 Subject: [PATCH 08/33] MDEV-34541 Clean up spider self reference check SPIDER_CONN::loop_check_meraged_first is useless, because all SPIDER_CONN_LOOP_CHECKs are in SPIDER_CONN::loop_check_queue, which in spider_db_conn::fin_loop_check() is iterated over. This fixes the use-after-free issue when there are three spider tables sharing the same remote, and their corresponding SPIDER_CONN_LOOP_CHECKs getting merged in spider_conn_queue_and_merge_loop_check() This also fixes MDEV-34555 --- .../spider/bugfix/r/mdev_34541.result | 35 +++++ .../spider/bugfix/r/mdev_34555.result | 32 +++++ .../spider/bugfix/t/mdev_34541.test | 48 +++++++ .../spider/bugfix/t/mdev_34555.test | 33 +++++ storage/spider/spd_conn.cc | 127 ++++++++++-------- storage/spider/spd_conn.h | 44 +++++- storage/spider/spd_db_include.cc | 16 +-- storage/spider/spd_db_mysql.cc | 16 +++ storage/spider/spd_include.h | 11 +- 9 files changed, 288 insertions(+), 74 deletions(-) create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_34555.result create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_34541.test create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_34555.test diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result new file mode 100644 index 00000000000..acc1528efc4 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_34541.result @@ -0,0 +1,35 @@ +for master_1 +for child2 +for child3 +SET SESSION spider_same_server_link=1; +SET sql_mode=''; +set @old_table_open_cache=@@global.table_open_cache; +set global table_open_cache=10; +set spider_same_server_link= 1; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); +CREATE TABLE t1 (c INT) ENGINE=InnoDB; +CREATE TABLE t2 (c INT) ENGINE=InnoDB; +CREATE TABLE t3 (c INT) ENGINE=InnoDB; +CREATE TABLE ta (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t5 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t6 (c INT KEY) ENGINE=InnoDB PARTITION BY RANGE (c) (PARTITION p VALUES LESS THAN (5)); +CREATE TABLE t7 (a INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t8 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +SELECT * FROM t8; +ERROR HY000: Remote table 'test.t' is not found +CREATE TEMPORARY TABLE t7 (c INT) ENGINE=InnoDB SELECT * FROM t7; +ERROR HY000: Remote table 'test.t' is not found +CALL foo; +ERROR 42000: PROCEDURE test.foo does not exist +CREATE TEMPORARY TABLE t7 (c INT) ENGINE=InnoDB; +SELECT * FROM t7 JOIN t6 ON tc=t0.c; +ERROR 42S22: Unknown column 'tc' in 'on clause' +SHOW TABLE STATUS; +drop table ta, t8, t7, t6, t5, t3, t2, t1; +drop table t7; +drop server srv; +set global table_open_cache=@old_table_open_cache; +for master_1 +for child2 +for child3 diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_34555.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_34555.result new file mode 100644 index 00000000000..5e464ea77bb --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_34555.result @@ -0,0 +1,32 @@ +for master_1 +for child2 +for child3 +set spider_same_server_link= 1; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE '',user 'Spider', password 'foo'); +CREATE TABLE tSpider (a INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t2 (c INT,c2 CHAR(1)) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +XA START 'a'; +SELECT * FROM information_schema.table_constraints; +SELECT SLEEP (1); +SLEEP (1) +0 +SELECT * FROM t2; +ERROR HY000: Unable to connect to foreign data source: srv +SELECT SLEEP (1); +SLEEP (1) +0 +SELECT * FROM t2; +ERROR HY000: Unable to connect to foreign data source: srv +SELECT SLEEP (1); +SLEEP (1) +0 +SELECT * FROM t2; +ERROR HY000: Unable to connect to foreign data source: srv +xa end 'a'; +xa rollback 'a'; +drop table tSpider, t2; +drop server srv; +for master_1 +for child2 +for child3 diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_34541.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_34541.test new file mode 100644 index 00000000000..8a36eb58f10 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_34541.test @@ -0,0 +1,48 @@ +--disable_query_log +--disable_result_log +--source ../../t/test_init.inc +--enable_result_log +--enable_query_log + +SET SESSION spider_same_server_link=1; +SET sql_mode=''; + +set @old_table_open_cache=@@global.table_open_cache; +set global table_open_cache=10; + +set spider_same_server_link= 1; +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); + +CREATE TABLE t1 (c INT) ENGINE=InnoDB; +CREATE TABLE t2 (c INT) ENGINE=InnoDB; +CREATE TABLE t3 (c INT) ENGINE=InnoDB; +CREATE TABLE ta (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t5 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t6 (c INT KEY) ENGINE=InnoDB PARTITION BY RANGE (c) (PARTITION p VALUES LESS THAN (5)); +CREATE TABLE t7 (a INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t8 (c INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +--error 12702 +SELECT * FROM t8; +--error 12702 +CREATE TEMPORARY TABLE t7 (c INT) ENGINE=InnoDB SELECT * FROM t7; +--error ER_SP_DOES_NOT_EXIST +CALL foo; +CREATE TEMPORARY TABLE t7 (c INT) ENGINE=InnoDB; +--error ER_BAD_FIELD_ERROR +SELECT * FROM t7 JOIN t6 ON tc=t0.c; +--disable_result_log +SHOW TABLE STATUS; +--enable_result_log + +# we need to drop t7 twice +drop table ta, t8, t7, t6, t5, t3, t2, t1; +drop table t7; +drop server srv; +set global table_open_cache=@old_table_open_cache; + +--disable_query_log +--disable_result_log +--source ../../t/test_deinit.inc +--enable_result_log +--enable_query_log diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_34555.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_34555.test new file mode 100644 index 00000000000..3a1cf604140 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_34555.test @@ -0,0 +1,33 @@ +--disable_query_log +--disable_result_log +--source ../../t/test_init.inc +--enable_result_log +--enable_query_log +set spider_same_server_link= 1; +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE '',user 'Spider', password 'foo'); +CREATE TABLE tSpider (a INT) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +CREATE TABLE t2 (c INT,c2 CHAR(1)) ENGINE=Spider COMMENT='WRAPPER "mysql",SRV "srv",TABLE "t"'; +XA START 'a'; +--disable_result_log +--error 0,ER_CONNECT_TO_FOREIGN_DATA_SOURCE +SELECT * FROM information_schema.table_constraints; +--enable_result_log +SELECT SLEEP (1); +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +SELECT * FROM t2; +SELECT SLEEP (1); +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +SELECT * FROM t2; +SELECT SLEEP (1); +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +SELECT * FROM t2; +xa end 'a'; +xa rollback 'a'; +drop table tSpider, t2; +drop server srv; +--disable_query_log +--disable_result_log +--source ../../t/test_deinit.inc +--enable_result_log +--enable_query_log diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc index 453e0aaf709..0ebd6d7d0cd 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc @@ -1151,27 +1151,41 @@ void spider_conn_queue_UTC_time_zone( DBUG_VOID_RETURN; } +/* + Construct merged values and insert into the loop check queue + + Search the loop_check_queue for the data node table, and if one does + not exist, construct the merged value in the same format as the + right hand side. Otherwise, merge the right hand side of the + existing SPIDER_CONN_LOOP_CHECK with the right hand side of lcptr + into one right hand side. In either case, add the + SPIDER_CONN_LOOP_CHECK to the loop check queue +*/ int spider_conn_queue_and_merge_loop_check( SPIDER_CONN *conn, SPIDER_CONN_LOOP_CHECK *lcptr ) { int error_num = HA_ERR_OUT_OF_MEM; - char *tmp_name, *from_name, *cur_name, *to_name, *full_name, *from_value, + char *tmp_name, *cur_name, *to_name, *full_name, *from_value, *merged_value; SPIDER_CONN_LOOP_CHECK *lcqptr, *lcrptr; DBUG_ENTER("spider_conn_queue_and_merge_loop_check"); DBUG_PRINT("info", ("spider conn=%p", conn)); #ifdef SPIDER_HAS_HASH_VALUE_TYPE - if (unlikely(!(lcqptr = (SPIDER_CONN_LOOP_CHECK *) + if (!(lcqptr = (SPIDER_CONN_LOOP_CHECK *) my_hash_search_using_hash_value(&conn->loop_check_queue, lcptr->hash_value_to, - (uchar *) lcptr->to_name.str, lcptr->to_name.length)))) + (uchar *) lcptr->to_name.str, lcptr->to_name.length))) #else if (unlikely(!(lcqptr = (SPIDER_CONN_LOOP_CHECK *) my_hash_search( &conn->loop_check_queue, (uchar *) lcptr->to_name.str, lcptr->to_name.length)))) #endif { + /* + Construct the right hand side: + ---- + */ DBUG_PRINT("info", ("spider create merged_value and insert")); lcptr->merged_value.length = spider_unique_id.length + lcptr->cur_name.length + lcptr->from_value.length + 1; @@ -1194,10 +1208,10 @@ int spider_conn_queue_and_merge_loop_check( } lcptr->flag |= SPIDER_LOP_CHK_QUEUED; } else { + /* Merge lcptr and lcqptr into a newly created lcrptr. */ DBUG_PRINT("info", ("spider append merged_value and replace")); if (unlikely(!spider_bulk_malloc(spider_current_trx, 271, MYF(MY_WME), &lcrptr, (uint) (sizeof(SPIDER_CONN_LOOP_CHECK)), - &from_name, (uint) (lcqptr->from_name.length + 1), &cur_name, (uint) (lcqptr->cur_name.length + 1), &to_name, (uint) (lcqptr->to_name.length + 1), &full_name, (uint) (lcqptr->full_name.length + 1), @@ -1209,13 +1223,13 @@ int spider_conn_queue_and_merge_loop_check( )) { goto error_alloc_loop_check_replace; } + /* + TODO: the new lcrptr has the same cur_name, to_name, full_name + and from_value as lcqptr, but they do not seem to be relevant. + */ #ifdef SPIDER_HAS_HASH_VALUE_TYPE lcrptr->hash_value_to = lcqptr->hash_value_to; - lcrptr->hash_value_full = lcqptr->hash_value_full; #endif - lcrptr->from_name.str = from_name; - lcrptr->from_name.length = lcqptr->from_name.length; - memcpy(from_name, lcqptr->from_name.str, lcqptr->from_name.length + 1); lcrptr->cur_name.str = cur_name; lcrptr->cur_name.length = lcqptr->cur_name.length; memcpy(cur_name, lcqptr->cur_name.str, lcqptr->cur_name.length + 1); @@ -1228,8 +1242,14 @@ int spider_conn_queue_and_merge_loop_check( lcrptr->from_value.str = from_value; lcrptr->from_value.length = lcqptr->from_value.length; memcpy(from_value, lcqptr->from_value.str, lcqptr->from_value.length + 1); + /* + The merged_value of lcrptr is a concatenation of that of lcqptr + and constructed merged_value from lcptr. + */ lcrptr->merged_value.str = merged_value; - lcrptr->merged_value.length = lcqptr->merged_value.length; + lcrptr->merged_value.length = + lcqptr->merged_value.length + spider_unique_id.length + + lcptr->cur_name.length + 1 + lcptr->from_value.length; memcpy(merged_value, lcqptr->merged_value.str, lcqptr->merged_value.length); merged_value += lcqptr->merged_value.length; @@ -1273,9 +1293,6 @@ int spider_conn_queue_and_merge_loop_check( goto error_hash_insert_queue; } lcptr->flag = SPIDER_LOP_CHK_MERAGED; - lcptr->next = NULL; - if (!conn->loop_check_meraged_first) - conn->loop_check_meraged_first = lcptr; } DBUG_RETURN(0); @@ -1296,7 +1313,6 @@ error_hash_insert: int spider_conn_reset_queue_loop_check( SPIDER_CONN *conn ) { - int error_num; SPIDER_CONN_LOOP_CHECK *lcptr; DBUG_ENTER("spider_conn_reset_queue_loop_check"); uint l = 0; @@ -1318,30 +1334,8 @@ int spider_conn_reset_queue_loop_check( ++l; } - lcptr = conn->loop_check_ignored_first; - while (lcptr) - { - lcptr->flag = 0; - if ((error_num = spider_conn_queue_and_merge_loop_check(conn, lcptr))) - { - goto error_queue_and_merge; - } - lcptr = lcptr->next; - } - conn->loop_check_meraged_first = NULL; pthread_mutex_unlock(&conn->loop_check_mutex); DBUG_RETURN(0); - -error_queue_and_merge: - lcptr = lcptr->next; - while (lcptr) - { - lcptr->flag = 0; - lcptr = lcptr->next; - } - conn->loop_check_meraged_first = NULL; - pthread_mutex_unlock(&conn->loop_check_mutex); - DBUG_RETURN(error_num); } int spider_conn_queue_loop_check( @@ -1352,7 +1346,7 @@ int spider_conn_queue_loop_check( int error_num = HA_ERR_OUT_OF_MEM; uint conn_link_idx = spider->conn_link_idx[link_idx], buf_sz; char path[FN_REFLEN + 1]; - char *tmp_name, *from_name, *cur_name, *to_name, *full_name, *from_value, + char *tmp_name, *cur_name, *to_name, *full_name, *from_value, *merged_value; user_var_entry *loop_check; char *loop_check_buf; @@ -1363,6 +1357,17 @@ int spider_conn_queue_loop_check( LEX_CSTRING lex_str, from_str, to_str; DBUG_ENTER("spider_conn_queue_loop_check"); DBUG_PRINT("info", ("spider conn=%p", conn)); + /* + construct loop check user var name (left hand side) into + lex_str. It is of the format + + spider_lc_ + + So if the spider table name is ./test/t1, then the constructed + user var name is: + + spider_lc_./test/t1 + */ lex_str.length = top_share->path.length + SPIDER_SQL_LOP_CHK_PRM_PRF_LEN; buf_sz = lex_str.length + 2; loop_check_buf = (char *) my_alloca(buf_sz); @@ -1388,6 +1393,16 @@ int spider_conn_queue_loop_check( } else { lex_str.str = loop_check->value; lex_str.length = loop_check->length; + /* + Validate that there are at least four dashes in the user var + value: ---- + + Note: if the value is merged from multiple values, such as + + "------------" + + then only the first component is put into from_str + */ DBUG_PRINT("info", ("spider from_str=%s", lex_str.str)); if (unlikely(!(tmp_name = strchr(loop_check->value, '-')))) { @@ -1415,12 +1430,23 @@ int spider_conn_queue_loop_check( } else { + /* + Validation passed. Put the first component of rhs in from_str + */ from_str.str = lex_str.str; from_str.length = tmp_name - lex_str.str + 1; } } my_afree(loop_check_buf); + /* + construct loop_check_buf as -- e.g. + "---./test/t0--./test/t1-./test/t2", later used as + full_name + from_str is the first component in the user var value (RHS) or + empty if user var value is empty, cur is the spider table, to_str + is the remote data node table + */ to_str.length = build_table_filename(path, FN_REFLEN, share->tgt_dbs[conn_link_idx] ? share->tgt_dbs[conn_link_idx] : "", share->tgt_table_names[conn_link_idx], "", 0); @@ -1457,7 +1483,7 @@ int spider_conn_queue_loop_check( lcptr = (SPIDER_CONN_LOOP_CHECK *) my_hash_search( &conn->loop_checked, (uchar *) loop_check_buf, buf_sz - 1); #endif - if (unlikely( + if ( !lcptr || ( !lcptr->flag && @@ -1466,7 +1492,7 @@ int spider_conn_queue_loop_check( memcmp(lcptr->from_value.str, lex_str.str, lex_str.length) ) ) - )) + ) { if (unlikely(lcptr)) { @@ -1482,7 +1508,6 @@ int spider_conn_queue_loop_check( DBUG_PRINT("info", ("spider alloc_lcptr")); if (unlikely(!spider_bulk_malloc(spider_current_trx, 272, MYF(MY_WME), &lcptr, (uint) (sizeof(SPIDER_CONN_LOOP_CHECK)), - &from_name, (uint) (from_str.length + 1), &cur_name, (uint) (top_share->path.length + 1), &to_name, (uint) (to_str.length + 1), &full_name, (uint) (buf_sz), @@ -1495,9 +1520,6 @@ int spider_conn_queue_loop_check( goto error_alloc_loop_check; } lcptr->flag = 0; - lcptr->from_name.str = from_name; - lcptr->from_name.length = from_str.length; - memcpy(from_name, from_str.str, from_str.length + 1); lcptr->cur_name.str = cur_name; lcptr->cur_name.length = top_share->path.length; memcpy(cur_name, top_share->path.str, top_share->path.length + 1); @@ -1510,12 +1532,19 @@ int spider_conn_queue_loop_check( lcptr->from_value.str = from_value; lcptr->from_value.length = lex_str.length; memcpy(from_value, lex_str.str, lex_str.length + 1); + /* + merged_value will only be populated later, in + spider_conn_queue_and_merge_loop_check() + */ lcptr->merged_value.str = merged_value; #ifdef SPIDER_HAS_HASH_VALUE_TYPE - lcptr->hash_value_to = my_calc_hash(&conn->loop_checked, + lcptr->hash_value_to = my_calc_hash(&conn->loop_check_queue, (uchar *) to_str.str, to_str.length); - lcptr->hash_value_full = hash_value; #endif + /* + Mark as checked. It will be added to loop_check_queue in + spider_conn_queue_and_merge_loop_check() below for checking + */ #ifdef HASH_UPDATE_WITH_HASH_VALUE if (unlikely(my_hash_insert_with_hash_value(&conn->loop_checked, lcptr->hash_value_full, (uchar *) lcptr))) @@ -1527,19 +1556,11 @@ int spider_conn_queue_loop_check( goto error_hash_insert; } } else { + /* Already marked as checked, ignore and return. */ if (!lcptr->flag) { DBUG_PRINT("info", ("spider add to ignored list")); lcptr->flag |= SPIDER_LOP_CHK_IGNORED; - lcptr->next = NULL; - if (!conn->loop_check_ignored_first) - { - conn->loop_check_ignored_first = lcptr; - conn->loop_check_ignored_last = lcptr; - } else { - conn->loop_check_ignored_last->next = lcptr; - conn->loop_check_ignored_last = lcptr; - } } pthread_mutex_unlock(&conn->loop_check_mutex); my_afree(loop_check_buf); diff --git a/storage/spider/spd_conn.h b/storage/spider/spd_conn.h index 92da278eecc..c9eeb9d66d4 100644 --- a/storage/spider/spd_conn.h +++ b/storage/spider/spd_conn.h @@ -26,24 +26,62 @@ #define SPIDER_SIMPLE_CHECKSUM_TABLE 4 #endif +/* + The SPIDER_CONN_LOOP_CHECK has been added to the loop_check queue to + check for self-reference. +*/ #define SPIDER_LOP_CHK_QUEUED (1 << 0) +/* + The SPIDER_CONN_LOOP_CHECK is a merge of multiple + SPIDER_CONN_LOOP_CHECKs with the same data node table +*/ #define SPIDER_LOP_CHK_MERAGED (1 << 1) +/* + The SPIDER_CONN_LOOP_CHECK has been ignored because it has already + been marked as checked +*/ #define SPIDER_LOP_CHK_IGNORED (1 << 2) +/* Used for self-reference check. */ typedef struct st_spider_conn_loop_check { + /* + Could be 0, SPIDER_LOP_CHK_QUEUED, SPIDER_LOP_CHK_MERAGED, or + SPIDER_LOP_CHK_IGNORED + */ uint flag; #ifdef SPIDER_HAS_HASH_VALUE_TYPE + /* hash value of to_name, used for the hash conn->loop_checked */ my_hash_value_type hash_value_to; - my_hash_value_type hash_value_full; #endif - LEX_CSTRING from_name; + /* + The fully qualified name of the current spider table, which will + also be used to construct the user var name to set in the data + node + */ LEX_CSTRING cur_name; + /* + The fully qualified data node table name, also used as key in + conn->loop_check_queue + */ LEX_CSTRING to_name; + /* + A concatenation of from_value, cur_name and to_name, used as key + in hash conn->loop_checked + */ LEX_CSTRING full_name; + /* + The first component of the uservar value on the current server, + consisting of information of a table that uses the current spider + table as a data node + */ LEX_CSTRING from_value; + /* + The uservar value to set in the data node, a concatenation of info + of tables, mac addresses and process ids of tables that use the + current spider table as the data node + */ LEX_CSTRING merged_value; - st_spider_conn_loop_check *next; } SPIDER_CONN_LOOP_CHECK; uchar *spider_conn_get_key( diff --git a/storage/spider/spd_db_include.cc b/storage/spider/spd_db_include.cc index e8ee365ba5d..4a422e0e1f2 100644 --- a/storage/spider/spd_db_include.cc +++ b/storage/spider/spd_db_include.cc @@ -66,7 +66,7 @@ spider_db_conn::spider_db_conn( DBUG_VOID_RETURN; } -int spider_db_conn::fin_loop_check() +int spider_db_conn::fin_loop_check() /* reset flags of all relevant SPIDER_CONN_LOOP_CHECKs */ { st_spider_conn_loop_check *lcptr; DBUG_ENTER("spider_db_conn::fin_loop_check"); @@ -82,20 +82,6 @@ int spider_db_conn::fin_loop_check() } my_hash_reset(&conn->loop_check_queue); } - lcptr = conn->loop_check_ignored_first; - while (lcptr) - { - lcptr->flag = 0; - lcptr = lcptr->next; - } - conn->loop_check_ignored_first = NULL; - lcptr = conn->loop_check_meraged_first; - while (lcptr) - { - lcptr->flag = 0; - lcptr = lcptr->next; - } - conn->loop_check_meraged_first = NULL; DBUG_RETURN(0); } diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 232a2b02c25..7ea91073cf2 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -5283,6 +5283,22 @@ int spider_db_mbase_util::append_time_zone( DBUG_RETURN(0); } +/* + iterate over loop_check_queue and build queries for loop check + + The query is in the form of + + set @`spider_lc_.` = + '--------...' + + where from_table1, from_table2 etc. are spider tables whose direct + or indirect remote data nodes contain to_table. + + e.g. if t0->t1->t2, then the query could be: + + set @`spider_lc_./test/t2` = + '-234567890abc-def012-./test/t1--1234567890ab-cdef01-./test/t0-' + */ int spider_db_mbase_util::append_loop_check( spider_string *str, SPIDER_CONN *conn diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index 6b9e2998144..1d190ec2348 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -793,19 +793,24 @@ typedef struct st_spider_conn SPIDER_IP_PORT_CONN *ip_port_conn; pthread_mutex_t loop_check_mutex; + /* + A hash of SPIDER_CONN_LOOP_CHECK, indexed by + SPIDER_CONN_LOOP_CHECK::full_name + */ HASH loop_checked; uint loop_checked_id; const char *loop_checked_func_name; const char *loop_checked_file_name; ulong loop_checked_line_no; + /* + A hash of SPIDER_CONN_LOOP_CHECK, indexed by + SPIDER_CONN_LOOP_CHECK::to_name + */ HASH loop_check_queue; uint loop_check_queue_id; const char *loop_check_queue_func_name; const char *loop_check_queue_file_name; ulong loop_check_queue_line_no; - SPIDER_CONN_LOOP_CHECK *loop_check_ignored_first; - SPIDER_CONN_LOOP_CHECK *loop_check_ignored_last; - SPIDER_CONN_LOOP_CHECK *loop_check_meraged_first; } SPIDER_CONN; typedef struct st_spider_lgtm_tblhnd_share From 384ec03e4884fcd224d5b12a8ccd53a7766280b2 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Fri, 21 Jun 2024 19:27:22 +0800 Subject: [PATCH 09/33] MDEV-34421 Check the SQL command when resolving storage engine ENGINE_SUBSTITUTION only applies to CREATE TABLE and ALTER TABLE, and Storage_engine_name::resolve_storage_engine_with_error() could be called when executing any sql command. --- sql/handler.cc | 4 +++- .../mysql-test/spider/bugfix/r/mdev_34421.result | 13 +++++++++++++ .../mysql-test/spider/bugfix/t/mdev_34421.test | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_34421.result create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_34421.test diff --git a/sql/handler.cc b/sql/handler.cc index 66c85f07574..e881d4d1677 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -311,7 +311,9 @@ Storage_engine_name::resolve_storage_engine_with_error(THD *thd, } *ha= NULL; - if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) + if ((thd_sql_command(thd) != SQLCOM_CREATE_TABLE && + thd_sql_command(thd) != SQLCOM_ALTER_TABLE) || + thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) { my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), m_storage_engine_name.str); return true; diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_34421.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_34421.result new file mode 100644 index 00000000000..d42f09a8f1c --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_34421.result @@ -0,0 +1,13 @@ +SET sql_mode=''; +INSTALL SONAME 'ha_spider'; +CREATE TABLE t (c INT) ENGINE=Spider PARTITION BY KEY(c) (PARTITION p); +UNINSTALL SONAME IF EXISTS 'ha_spider'; +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown +INSERT INTO t SELECT 1; +ERROR 42000: Unknown storage engine 'SPIDER' +drop table t; +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown +Note 1305 PLUGIN SPIDER_ALLOC_MEM does not exist +Note 1305 PLUGIN SPIDER_WRAPPER_PROTOCOLS does not exist diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_34421.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_34421.test new file mode 100644 index 00000000000..a63993446e9 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_34421.test @@ -0,0 +1,10 @@ +--source include/have_partition.inc +SET sql_mode=''; +INSTALL SONAME 'ha_spider'; +CREATE TABLE t (c INT) ENGINE=Spider PARTITION BY KEY(c) (PARTITION p); +UNINSTALL SONAME IF EXISTS 'ha_spider'; +--error ER_UNKNOWN_STORAGE_ENGINE +INSERT INTO t SELECT 1; +drop table t; +--disable_query_log +--source ../../include/clean_up_spider.inc From 972879f413a1aa8aa2d52b731fe65315f9be208b Mon Sep 17 00:00:00 2001 From: Oleg Smirnov Date: Mon, 1 Apr 2024 14:03:46 +0700 Subject: [PATCH 10/33] MDEV-33010 Crash when pushing condition with CHARSET()/COERCIBILITY() into derived table Based on the current logic, objects of classes Item_func_charset and Item_func_coercibility (responsible for CHARSET() and COERCIBILITY() functions) are always considered constant. However, SQL syntax allows their use in a non-constant manner, such as CHARSET(t1.a), COERCIBILITY(t1.a). In these cases, the `used_tables()` parameter corresponds to table names in the function parameters, creating an inconsistency: the item is marked as constant but accesses tables. This leads to crashes when conditions with CHARSET()/COERCIBILITY() are pushed into derived tables. This commit addresses the issue by setting `used_tables()` to 0 for `Item_func_charset` and `Item_func_coercibility`. Additionally, the items now store the return values during the preparation phase and return them during the execution phase. This ensures that the items do not call its arguments methods during the execution and are truly constant. Reviewer: Alexander Barkov --- .../main/derived_cond_pushdown_innodb.result | 39 +++++++++++++++++++ .../main/derived_cond_pushdown_innodb.test | 31 +++++++++++++++ mysql-test/main/olap.result | 8 +--- mysql-test/main/olap.test | 7 ---- sql/item_func.cc | 18 ++++++++- sql/item_func.h | 5 ++- sql/item_strfunc.cc | 3 +- sql/item_strfunc.h | 19 +++++++++ 8 files changed, 112 insertions(+), 18 deletions(-) create mode 100644 mysql-test/main/derived_cond_pushdown_innodb.result create mode 100644 mysql-test/main/derived_cond_pushdown_innodb.test diff --git a/mysql-test/main/derived_cond_pushdown_innodb.result b/mysql-test/main/derived_cond_pushdown_innodb.result new file mode 100644 index 00000000000..d01ce8cdd20 --- /dev/null +++ b/mysql-test/main/derived_cond_pushdown_innodb.result @@ -0,0 +1,39 @@ +# +# MDEV-33010: Crash when pushing condition with CHARSET()/COERCIBILITY() +# into derived table +# +CREATE TABLE t1 (c1 BIGINT, KEY (c1)) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +CREATE TABLE t2 (c2 DOUBLE UNSIGNED); +INSERT INTO t2 VALUES (1); +SET optimizer_switch='derived_merge=off'; +EXPLAIN EXTENDED +SELECT dt1_c1 FROM +(SELECT c1 AS dt1_c1 FROM t1) AS dt1 +JOIN +(SELECT 1 AS dt2_c2 FROM t2) AS dt2 +ON CHARSET(dt2_c2) BETWEEN dt1_c1 AND dt1_c1; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY system NULL NULL NULL NULL 1 100.00 +1 PRIMARY ALL NULL NULL NULL NULL 2 100.00 Using where +3 DERIVED t2 system NULL NULL NULL NULL 1 100.00 +2 DERIVED t1 ref c1 c1 9 const 1 100.00 Using where; Using index +Warnings: +Warning 1292 Truncated incorrect DECIMAL value: 'binary' +Note 1003 /* select#1 */ select `dt1`.`dt1_c1` AS `dt1_c1` from (/* select#2 */ select `test`.`t1`.`c1` AS `dt1_c1` from `test`.`t1` where (charset(1)) between `test`.`t1`.`c1` and `test`.`t1`.`c1`) `dt1` where (charset(1)) between `dt1`.`dt1_c1` and `dt1`.`dt1_c1` +EXPLAIN EXTENDED +SELECT dt1_c1 FROM +(SELECT c1 AS dt1_c1 FROM t1) AS dt1 +JOIN +(SELECT 1 AS dt2_c2 FROM t2) AS dt2 +ON COERCIBILITY(dt2_c2) BETWEEN dt1_c1 AND dt1_c1; +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY system NULL NULL NULL NULL 1 100.00 +1 PRIMARY ALL NULL NULL NULL NULL 2 100.00 Using where +3 DERIVED t2 system NULL NULL NULL NULL 1 100.00 +2 DERIVED t1 ref c1 c1 9 const 1 100.00 Using where; Using index +Warnings: +Note 1003 /* select#1 */ select `dt1`.`dt1_c1` AS `dt1_c1` from (/* select#2 */ select `test`.`t1`.`c1` AS `dt1_c1` from `test`.`t1` where (coercibility(1)) between `test`.`t1`.`c1` and `test`.`t1`.`c1`) `dt1` where (coercibility(1)) between `dt1`.`dt1_c1` and `dt1`.`dt1_c1` +SET optimizer_switch=DEFAULT; +DROP TABLE t1, t2; +# End of 10.4 tests diff --git a/mysql-test/main/derived_cond_pushdown_innodb.test b/mysql-test/main/derived_cond_pushdown_innodb.test new file mode 100644 index 00000000000..2904e638db3 --- /dev/null +++ b/mysql-test/main/derived_cond_pushdown_innodb.test @@ -0,0 +1,31 @@ +--source include/have_innodb.inc + +--echo # +--echo # MDEV-33010: Crash when pushing condition with CHARSET()/COERCIBILITY() +--echo # into derived table +--echo # +CREATE TABLE t1 (c1 BIGINT, KEY (c1)) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +CREATE TABLE t2 (c2 DOUBLE UNSIGNED); +INSERT INTO t2 VALUES (1); + +SET optimizer_switch='derived_merge=off'; + +EXPLAIN EXTENDED + SELECT dt1_c1 FROM + (SELECT c1 AS dt1_c1 FROM t1) AS dt1 + JOIN + (SELECT 1 AS dt2_c2 FROM t2) AS dt2 + ON CHARSET(dt2_c2) BETWEEN dt1_c1 AND dt1_c1; + +EXPLAIN EXTENDED + SELECT dt1_c1 FROM + (SELECT c1 AS dt1_c1 FROM t1) AS dt1 + JOIN + (SELECT 1 AS dt2_c2 FROM t2) AS dt2 + ON COERCIBILITY(dt2_c2) BETWEEN dt1_c1 AND dt1_c1; + +SET optimizer_switch=DEFAULT; +DROP TABLE t1, t2; + +--echo # End of 10.4 tests diff --git a/mysql-test/main/olap.result b/mysql-test/main/olap.result index b837aeaf1db..22186ee085c 100644 --- a/mysql-test/main/olap.result +++ b/mysql-test/main/olap.result @@ -787,18 +787,12 @@ DROP TABLE t1; # # MDEV-17830 Server crashes in Item_null_result::field_type upon SELECT with CHARSET(date) and ROLLUP # -# Note, different MariaDB versions can return different results -# in the two rows (such as "latin1" vs "binary"). This is wrong. -# Both lines should return equal values. -# The point in this test is to make sure it does not crash. -# As this is a minor issue, bad result will be fixed -# in a later version, presumably in 10.4. CREATE TABLE t (d DATE) ENGINE=MyISAM; INSERT INTO t VALUES ('2018-12-12'); SELECT CHARSET(d) AS f FROM t GROUP BY d WITH ROLLUP; f binary -latin1 +binary DROP TABLE t; # # MDEV-14041 Server crashes in String::length on queries with functions and ROLLUP diff --git a/mysql-test/main/olap.test b/mysql-test/main/olap.test index 0a3d8e55858..51aa35b757a 100644 --- a/mysql-test/main/olap.test +++ b/mysql-test/main/olap.test @@ -433,13 +433,6 @@ DROP TABLE t1; --echo # MDEV-17830 Server crashes in Item_null_result::field_type upon SELECT with CHARSET(date) and ROLLUP --echo # ---echo # Note, different MariaDB versions can return different results ---echo # in the two rows (such as "latin1" vs "binary"). This is wrong. ---echo # Both lines should return equal values. ---echo # The point in this test is to make sure it does not crash. ---echo # As this is a minor issue, bad result will be fixed ---echo # in a later version, presumably in 10.4. - CREATE TABLE t (d DATE) ENGINE=MyISAM; INSERT INTO t VALUES ('2018-12-12'); SELECT CHARSET(d) AS f FROM t GROUP BY d WITH ROLLUP; diff --git a/sql/item_func.cc b/sql/item_func.cc index 4e835243f02..553a044eb83 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3143,11 +3143,27 @@ longlong Item_func_char_length::val_int() } +bool Item_func_coercibility::fix_length_and_dec() +{ + max_length=10; + maybe_null= 0; + /* + Since this is a const item which doesn't use tables (see used_tables()), + we don't want to access the function arguments during execution. + That's why we store the derivation here during the preparation phase + and only return it later at the execution phase + */ + DBUG_ASSERT(args[0]->is_fixed()); + m_cached_collation_derivation= (longlong) args[0]->collation.derivation; + return false; +} + + longlong Item_func_coercibility::val_int() { DBUG_ASSERT(fixed == 1); null_value= 0; - return (longlong) args[0]->collation.derivation; + return m_cached_collation_derivation; } diff --git a/sql/item_func.h b/sql/item_func.h index 9e6ab703dad..1ac6045ee61 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2285,13 +2285,15 @@ public: class Item_func_coercibility :public Item_long_func { + longlong m_cached_collation_derivation; + bool check_arguments() const override { return args[0]->check_type_can_return_str(func_name()); } public: Item_func_coercibility(THD *thd, Item *a): Item_long_func(thd, a) {} longlong val_int() override; const char *func_name() const override { return "coercibility"; } - bool fix_length_and_dec() override { max_length=10; maybe_null= 0; return FALSE; } + bool fix_length_and_dec() override; bool eval_not_null_tables(void *) override { not_null_tables_cache= 0; @@ -2306,6 +2308,7 @@ public: bool const_item() const override { return true; } Item *do_get_copy(THD *thd) const override { return get_item_copy(thd, this); } + table_map used_tables() const override { return 0; } }; diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 8c8bb04edef..4a54cf06b92 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3625,9 +3625,8 @@ String *Item_func_charset::val_str(String *str) DBUG_ASSERT(fixed == 1); uint dummy_errors; - CHARSET_INFO *cs= args[0]->charset_for_protocol(); null_value= 0; - str->copy(cs->csname, (uint) strlen(cs->csname), + str->copy(m_cached_charset_info.str, m_cached_charset_info.length, &my_charset_latin1, collation.collation, &dummy_errors); return str; } diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index c713534e42d..e40eed1adf2 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1692,6 +1692,8 @@ public: class Item_func_charset :public Item_func_expr_str_metadata { + LEX_CSTRING m_cached_charset_info; + public: Item_func_charset(THD *thd, Item *a) :Item_func_expr_str_metadata(thd, a) { } @@ -1699,6 +1701,23 @@ public: const char *func_name() const override { return "charset"; } Item *do_get_copy(THD *thd) const override { return get_item_copy(thd, this); } + table_map used_tables() const override { return 0; } + bool fix_length_and_dec() override + { + if (Item_func_expr_str_metadata::fix_length_and_dec()) + return true; + /* + Since this is a const item which doesn't use tables (see used_tables()), + we don't want to access the function arguments during execution. + That's why we store the charset here during the preparation phase + and only return it later at the execution phase + */ + DBUG_ASSERT(args[0]->is_fixed()); + m_cached_charset_info.str= args[0]->charset_for_protocol()->csname; + m_cached_charset_info.length= + strlen(args[0]->charset_for_protocol()->csname); + return false; + } }; From 62dfd0c09dc2f138075047e726f2cab592807edb Mon Sep 17 00:00:00 2001 From: Tuukka Pasanen Date: Fri, 14 Jun 2024 09:51:44 +0300 Subject: [PATCH 11/33] MDEV-33837: Workaround chown warnings Blindly recursive chown is not way to do it. This Workaround is not much better than just chown -R but there is small adjustment just chown MariaDB statedir and logdir then with find only chown those files that are not correctly owned. Fixes lintian warnings: * W: mariadb-server: recursive-privilege-change "chown -R" [postinst:*] * W: mariadb-server: recursive-privilege-change "chown -R" [postinst:*] --- debian/mariadb-server-10.5.postinst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/mariadb-server-10.5.postinst b/debian/mariadb-server-10.5.postinst index d6017f32169..0d84d943258 100644 --- a/debian/mariadb-server-10.5.postinst +++ b/debian/mariadb-server-10.5.postinst @@ -128,10 +128,12 @@ EOF # The mysql_statedir must not be writable by the mysql user under any # circumstances as it contains scripts that are executed by root. set +e - chown -R 0:0 $mysql_statedir - find $mysql_datadir ! -uid "$(id -u mysql)" -print0 | xargs -0 -r chown mysql - chown -R mysql:adm $mysql_logdir - chmod 2750 $mysql_logdir + chown 0:0 "$mysql_statedir" + find "$mysql_statedir" ! -uid 0 -print0 | xargs -0 -r chown 0:0 + find "$mysql_datadir" ! -uid "$(id -u mysql)" -print0 | xargs -0 -r chown mysql + chown mysql:adm "$mysql_logdir" + find "$mysql_logdir" -print0 | xargs -0 -r chown mysql:adm + chmod 2750 "$mysql_logdir" set -e ## Set the correct filesystem ownership for the PAM v2 plugin From 6f3baec4f5bf32392532b5142e92ea2010a34815 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Tue, 11 Jun 2024 16:30:00 +1000 Subject: [PATCH 12/33] MDEV-32627 Spider: add tests for connection param overriding When connection parameters are specified in COMMENT, CONNECTION and SERVER, they are overriden in the following order: COMMENT > CONNECTION > SERVER --- .../spider/r/connection_override.result | 44 +++++++++++++++++++ .../spider/t/connection_override.cnf | 2 + .../spider/t/connection_override.test | 43 ++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 storage/spider/mysql-test/spider/r/connection_override.result create mode 100644 storage/spider/mysql-test/spider/t/connection_override.cnf create mode 100644 storage/spider/mysql-test/spider/t/connection_override.test diff --git a/storage/spider/mysql-test/spider/r/connection_override.result b/storage/spider/mysql-test/spider/r/connection_override.result new file mode 100644 index 00000000000..8ecc0139212 --- /dev/null +++ b/storage/spider/mysql-test/spider/r/connection_override.result @@ -0,0 +1,44 @@ +for master_1 +for child2 +for child3 +set spider_same_server_link= 1; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'invalid',user 'root'); +create table t2 (c int); +create table t1 (c int) ENGINE=Spider +COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", database "test"'; +insert into t1 values (1), (2), (3); +select * from t1; +c +1 +2 +3 +drop table t1, t2; +drop server srv; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'invalid',user 'root'); +create table t2 (c int); +create table t1 (c int) ENGINE=Spider +CONNECTION='WRAPPER "mysql", srv "srv",TABLE "t2", database "test"'; +insert into t1 values (1), (2), (3); +select * from t1; +c +1 +2 +3 +drop table t1, t2; +drop server srv; +create table t2 (c int); +create table t1 (c int) ENGINE=Spider +CONNECTION='user "root", database "invalid"' +COMMENT='WRAPPER "mysql", SOCKET "$MASTER_1_MYSOCK",TABLE "t2", database "test"'; +insert into t1 values (1), (2), (3); +select * from t1; +c +1 +2 +3 +drop table t1, t2; +for master_1 +for child2 +for child3 diff --git a/storage/spider/mysql-test/spider/t/connection_override.cnf b/storage/spider/mysql-test/spider/t/connection_override.cnf new file mode 100644 index 00000000000..b0853e32654 --- /dev/null +++ b/storage/spider/mysql-test/spider/t/connection_override.cnf @@ -0,0 +1,2 @@ +!include include/default_mysqld.cnf +!include ../my_1_1.cnf diff --git a/storage/spider/mysql-test/spider/t/connection_override.test b/storage/spider/mysql-test/spider/t/connection_override.test new file mode 100644 index 00000000000..1672b27decb --- /dev/null +++ b/storage/spider/mysql-test/spider/t/connection_override.test @@ -0,0 +1,43 @@ +--disable_query_log +--disable_result_log +--source test_init.inc +--enable_result_log +--enable_query_log +set spider_same_server_link= 1; + +# COMMENT overrides SERVER +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'invalid',user 'root'); +create table t2 (c int); +create table t1 (c int) ENGINE=Spider +COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2", database "test"'; +insert into t1 values (1), (2), (3); +select * from t1; +drop table t1, t2; +drop server srv; + +# CONNECTION overrides SERVER +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'invalid',user 'root'); +create table t2 (c int); +create table t1 (c int) ENGINE=Spider +CONNECTION='WRAPPER "mysql", srv "srv",TABLE "t2", database "test"'; +insert into t1 values (1), (2), (3); +select * from t1; +drop table t1, t2; +drop server srv; + +# COMMENT overrides CONNECTION +create table t2 (c int); +evalp create table t1 (c int) ENGINE=Spider +CONNECTION='user "root", database "invalid"' +COMMENT='WRAPPER "mysql", SOCKET "$MASTER_1_MYSOCK",TABLE "t2", database "test"'; +insert into t1 values (1), (2), (3); +select * from t1; +drop table t1, t2; + +--disable_query_log +--disable_result_log +--source test_deinit.inc +--enable_result_log +--enable_query_log From 20d99f3f86abb5f37cec698f3ff3fa35f5d3a35c Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Tue, 4 Jun 2024 14:51:25 +1000 Subject: [PATCH 13/33] MDEV-32627 Distinguish between absence of a keyword and empty value for the keyword Distinguish them in two place: when constructing connection key in create_conn_key and spider_create_conn for both ordinary queries and spider_direct_sql For spider_create_conn and spider_udf_direct_sql_create_conn, the created conn gets assigned a field from the source object if and only if source->field is non-null. For spider_create_conn_keys and spider_udf_direct_sql_create_conn_key, we update the encoding so that absence of keyword and keyword with an empty value result in different keys. More specifically, if the i-th keyword has a value, the corresponding part in the conn key begins with the char \i, followed by the possibly empty value and ends with a \0. If the i-th keyword is not specified, then it does not get a mention in the conn key. As part of this change, we also update table param / option parsing to recognise a singleton empty string when creating an string list, instead of writing it off as NULL. --- storage/spider/spd_conn.cc | 163 ++++++++++++------------------ storage/spider/spd_direct_sql.cc | 161 ++++++++++-------------------- storage/spider/spd_table.cc | 166 ++++++++++--------------------- storage/spider/spd_table.h | 2 + 4 files changed, 169 insertions(+), 323 deletions(-) diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc index 0ebd6d7d0cd..5549b30caa4 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc @@ -397,6 +397,19 @@ void spider_free_conn_from_trx( DBUG_VOID_RETURN; } +static inline void spider_memcpy_or_null(char **dest, char *alloced, + char *src, uint *dest_len, + uint tgt_len) +{ + *dest_len= tgt_len; + if (src) + { + *dest= alloced; + memcpy(*dest, src, tgt_len); + } else + *dest= NULL; +} + SPIDER_CONN *spider_create_conn( SPIDER_SHARE *share, ha_spider *spider, @@ -474,106 +487,62 @@ SPIDER_CONN *spider_create_conn( #ifdef SPIDER_HAS_HASH_VALUE_TYPE conn->conn_key_hash_value = share->conn_keys_hash_value[link_idx]; #endif - conn->tgt_host_length = share->tgt_hosts_lengths[link_idx]; - conn->tgt_host = tmp_host; - memcpy(conn->tgt_host, share->tgt_hosts[link_idx], - share->tgt_hosts_lengths[link_idx]); - - conn->tgt_username_length = share->tgt_usernames_lengths[link_idx]; - conn->tgt_username = tmp_username; - if (conn->tgt_username_length) - memcpy(conn->tgt_username, share->tgt_usernames[link_idx], - share->tgt_usernames_lengths[link_idx]); - - conn->tgt_password_length = share->tgt_passwords_lengths[link_idx]; - conn->tgt_password = tmp_password; - if (conn->tgt_password_length) - memcpy(conn->tgt_password, share->tgt_passwords[link_idx], - share->tgt_passwords_lengths[link_idx]); - - conn->tgt_socket_length = share->tgt_sockets_lengths[link_idx]; - conn->tgt_socket = tmp_socket; - if (conn->tgt_socket_length) - memcpy(conn->tgt_socket, share->tgt_sockets[link_idx], - share->tgt_sockets_lengths[link_idx]); - - conn->tgt_wrapper_length = share->tgt_wrappers_lengths[link_idx]; - conn->tgt_wrapper = tmp_wrapper; - memcpy(conn->tgt_wrapper, share->tgt_wrappers[link_idx], - share->tgt_wrappers_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_host, tmp_host, + share->tgt_hosts[link_idx], &conn->tgt_host_length, + share->tgt_hosts_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_username, tmp_username, + share->tgt_usernames[link_idx], + &conn->tgt_username_length, + share->tgt_usernames_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_password, tmp_password, + share->tgt_passwords[link_idx], + &conn->tgt_password_length, + share->tgt_passwords_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_socket, tmp_socket, + share->tgt_sockets[link_idx], + &conn->tgt_socket_length, + share->tgt_sockets_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_wrapper, tmp_wrapper, + share->tgt_wrappers[link_idx], + &conn->tgt_wrapper_length, + share->tgt_wrappers_lengths[link_idx]); if (!tables_on_different_db_are_joinable) { - conn->tgt_db_length = share->tgt_dbs_lengths[link_idx]; - conn->tgt_db = tmp_db; - memcpy(conn->tgt_db, share->tgt_dbs[link_idx], - share->tgt_dbs_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_db, tmp_db, share->tgt_dbs[link_idx], + &conn->tgt_db_length, + share->tgt_dbs_lengths[link_idx]); } - conn->tgt_ssl_ca_length = share->tgt_ssl_cas_lengths[link_idx]; - if (conn->tgt_ssl_ca_length) - { - conn->tgt_ssl_ca = tmp_ssl_ca; - memcpy(conn->tgt_ssl_ca, share->tgt_ssl_cas[link_idx], - share->tgt_ssl_cas_lengths[link_idx]); - } else - conn->tgt_ssl_ca = NULL; - conn->tgt_ssl_capath_length = share->tgt_ssl_capaths_lengths[link_idx]; - if (conn->tgt_ssl_capath_length) - { - conn->tgt_ssl_capath = tmp_ssl_capath; - memcpy(conn->tgt_ssl_capath, share->tgt_ssl_capaths[link_idx], - share->tgt_ssl_capaths_lengths[link_idx]); - } else - conn->tgt_ssl_capath = NULL; - conn->tgt_ssl_cert_length = share->tgt_ssl_certs_lengths[link_idx]; - if (conn->tgt_ssl_cert_length) - { - conn->tgt_ssl_cert = tmp_ssl_cert; - memcpy(conn->tgt_ssl_cert, share->tgt_ssl_certs[link_idx], - share->tgt_ssl_certs_lengths[link_idx]); - } else - conn->tgt_ssl_cert = NULL; - conn->tgt_ssl_cipher_length = share->tgt_ssl_ciphers_lengths[link_idx]; - if (conn->tgt_ssl_cipher_length) - { - conn->tgt_ssl_cipher = tmp_ssl_cipher; - memcpy(conn->tgt_ssl_cipher, share->tgt_ssl_ciphers[link_idx], - share->tgt_ssl_ciphers_lengths[link_idx]); - } else - conn->tgt_ssl_cipher = NULL; - conn->tgt_ssl_key_length = share->tgt_ssl_keys_lengths[link_idx]; - if (conn->tgt_ssl_key_length) - { - conn->tgt_ssl_key = tmp_ssl_key; - memcpy(conn->tgt_ssl_key, share->tgt_ssl_keys[link_idx], - share->tgt_ssl_keys_lengths[link_idx]); - } else - conn->tgt_ssl_key = NULL; - conn->tgt_default_file_length = share->tgt_default_files_lengths[link_idx]; - if (conn->tgt_default_file_length) - { - conn->tgt_default_file = tmp_default_file; - memcpy(conn->tgt_default_file, share->tgt_default_files[link_idx], - share->tgt_default_files_lengths[link_idx]); - } else - conn->tgt_default_file = NULL; - conn->tgt_default_group_length = - share->tgt_default_groups_lengths[link_idx]; - if (conn->tgt_default_group_length) - { - conn->tgt_default_group = tmp_default_group; - memcpy(conn->tgt_default_group, share->tgt_default_groups[link_idx], - share->tgt_default_groups_lengths[link_idx]); - } else - conn->tgt_default_group = NULL; - conn->tgt_dsn_length = - share->tgt_dsns_lengths[link_idx]; - if (conn->tgt_dsn_length) - { - conn->tgt_dsn = tmp_dsn; - memcpy(conn->tgt_dsn, share->tgt_dsns[link_idx], - share->tgt_dsns_lengths[link_idx]); - } else - conn->tgt_dsn = NULL; + spider_memcpy_or_null(&conn->tgt_ssl_ca, tmp_ssl_ca, + share->tgt_ssl_cas[link_idx], + &conn->tgt_ssl_ca_length, + share->tgt_ssl_cas_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_ssl_capath, tmp_ssl_capath, + share->tgt_ssl_capaths[link_idx], + &conn->tgt_ssl_capath_length, + share->tgt_ssl_capaths_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_ssl_cert, tmp_ssl_cert, + share->tgt_ssl_certs[link_idx], + &conn->tgt_ssl_cert_length, + share->tgt_ssl_certs_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_ssl_cipher, tmp_ssl_cipher, + share->tgt_ssl_ciphers[link_idx], + &conn->tgt_ssl_cipher_length, + share->tgt_ssl_ciphers_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_ssl_key, tmp_ssl_key, + share->tgt_ssl_keys[link_idx], + &conn->tgt_ssl_key_length, + share->tgt_ssl_keys_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_default_file, tmp_default_file, + share->tgt_default_files[link_idx], + &conn->tgt_default_file_length, + share->tgt_default_files_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_default_group, tmp_default_group, + share->tgt_default_groups[link_idx], + &conn->tgt_default_group_length, + share->tgt_default_groups_lengths[link_idx]); + spider_memcpy_or_null(&conn->tgt_dsn, tmp_dsn, share->tgt_dsns[link_idx], + &conn->tgt_dsn_length, + share->tgt_dsns_lengths[link_idx]); conn->tgt_port = share->tgt_ports[link_idx]; conn->tgt_ssl_vsc = share->tgt_ssl_vscs[link_idx]; conn->dbton_id = share->sql_dbton_ids[link_idx]; diff --git a/storage/spider/spd_direct_sql.cc b/storage/spider/spd_direct_sql.cc index 462d83f3a84..0a242787e8f 100644 --- a/storage/spider/spd_direct_sql.cc +++ b/storage/spider/spd_direct_sql.cc @@ -219,23 +219,23 @@ int spider_udf_direct_sql_create_conn_key( tables_on_different_db_are_joinable(); direct_sql->conn_key_length = 1 - + direct_sql->tgt_wrapper_length + 1 - + direct_sql->tgt_host_length + 1 - + 5 + 1 - + direct_sql->tgt_socket_length + 1 - + (tables_on_different_db_are_joinable ? - 0 : direct_sql->tgt_default_db_name_length + 1) - + direct_sql->tgt_username_length + 1 - + direct_sql->tgt_password_length + 1 - + direct_sql->tgt_ssl_ca_length + 1 - + direct_sql->tgt_ssl_capath_length + 1 - + direct_sql->tgt_ssl_cert_length + 1 - + direct_sql->tgt_ssl_cipher_length + 1 - + direct_sql->tgt_ssl_key_length + 1 - + 1 + 1 - + direct_sql->tgt_default_file_length + 1 - + direct_sql->tgt_default_group_length + 1 - + direct_sql->tgt_dsn_length; + + (direct_sql->tgt_wrapper ? direct_sql->tgt_wrapper_length + 2 : 0) + + (direct_sql->tgt_host ? direct_sql->tgt_host_length + 2 : 0) + + 5 + 2 + + (direct_sql->tgt_socket ? direct_sql->tgt_socket_length + 2 : 0) + + (!tables_on_different_db_are_joinable && direct_sql->tgt_default_db_name ? + direct_sql->tgt_default_db_name_length + 2 : 0) + + (direct_sql->tgt_username ? direct_sql->tgt_username_length + 2 : 0) + + (direct_sql->tgt_password ? direct_sql->tgt_password_length + 2 : 0) + + (direct_sql->tgt_ssl_ca ? direct_sql->tgt_ssl_ca_length + 2 : 0) + + (direct_sql->tgt_ssl_capath ? direct_sql->tgt_ssl_capath_length + 2 : 0) + + (direct_sql->tgt_ssl_cert ? direct_sql->tgt_ssl_cert_length + 2 : 0) + + (direct_sql->tgt_ssl_cipher ? direct_sql->tgt_ssl_cipher_length + 2 : 0) + + (direct_sql->tgt_ssl_key ? direct_sql->tgt_ssl_key_length + 2 : 0) + + 1 + 2 + + (direct_sql->tgt_default_file ? direct_sql->tgt_default_file_length + 2 : 0) + + (direct_sql->tgt_default_group ? direct_sql->tgt_default_group_length + 2 : 0) + + (direct_sql->tgt_dsn ? direct_sql->tgt_dsn_length + 2 : 0); if (!(direct_sql->conn_key = (char *) spider_malloc(spider_current_trx, SPD_MID_UDF_DIRECT_SQL_CREATE_CONN_KEY_1, direct_sql->conn_key_length + 1, MYF(MY_WME | MY_ZEROFILL))) @@ -245,96 +245,36 @@ int spider_udf_direct_sql_create_conn_key( *direct_sql->conn_key = '0' + 48 - direct_sql->connection_channel; else *direct_sql->conn_key = '0' + direct_sql->connection_channel; - DBUG_PRINT("info",("spider tgt_wrapper=%s", direct_sql->tgt_wrapper)); - tmp_name = strmov(direct_sql->conn_key + 1, direct_sql->tgt_wrapper); - DBUG_PRINT("info",("spider tgt_host=%s", direct_sql->tgt_host)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_host); + int counter= 0; + tmp_name= direct_sql->conn_key + 1; + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_wrapper); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_host); my_sprintf(port_str, (port_str, "%05ld", direct_sql->tgt_port)); - DBUG_PRINT("info",("spider port_str=%s", port_str)); - tmp_name = strmov(tmp_name + 1, port_str); - if (direct_sql->tgt_socket) + spider_create_conn_key_add_one(&counter, &tmp_name, port_str); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_socket); + counter++; + if (!tables_on_different_db_are_joinable && direct_sql->tgt_default_db_name) { - DBUG_PRINT("info",("spider tgt_socket=%s", direct_sql->tgt_socket)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_socket); - } else + *tmp_name= (char) counter; + tmp_name = strmov(tmp_name + 1, direct_sql->tgt_default_db_name); tmp_name++; - if (!tables_on_different_db_are_joinable) - { - if (direct_sql->tgt_default_db_name) - { - DBUG_PRINT("info",("spider tgt_default_db_name=%s", - direct_sql->tgt_default_db_name)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_default_db_name); - } else - tmp_name++; } - if (direct_sql->tgt_username) - { - DBUG_PRINT("info",("spider tgt_username=%s", direct_sql->tgt_username)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_username); - } else - tmp_name++; - if (direct_sql->tgt_password) - { - DBUG_PRINT("info",("spider tgt_password=%s", direct_sql->tgt_password)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_password); - } else - tmp_name++; - if (direct_sql->tgt_ssl_ca) - { - DBUG_PRINT("info",("spider tgt_ssl_ca=%s", direct_sql->tgt_ssl_ca)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_ssl_ca); - } else - tmp_name++; - if (direct_sql->tgt_ssl_capath) - { - DBUG_PRINT("info",("spider tgt_ssl_capath=%s", - direct_sql->tgt_ssl_capath)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_ssl_capath); - } else - tmp_name++; - if (direct_sql->tgt_ssl_cert) - { - DBUG_PRINT("info",("spider tgt_ssl_cert=%s", direct_sql->tgt_ssl_cert)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_ssl_cert); - } else - tmp_name++; - if (direct_sql->tgt_ssl_cipher) - { - DBUG_PRINT("info",("spider tgt_ssl_cipher=%s", - direct_sql->tgt_ssl_cipher)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_ssl_cipher); - } else - tmp_name++; - if (direct_sql->tgt_ssl_key) - { - DBUG_PRINT("info",("spider tgt_ssl_key=%s", direct_sql->tgt_ssl_key)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_ssl_key); - } else - tmp_name++; - tmp_name++; - *tmp_name = '0' + ((char) direct_sql->tgt_ssl_vsc); - if (direct_sql->tgt_default_file) - { - DBUG_PRINT("info",("spider tgt_default_file=%s", - direct_sql->tgt_default_file)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_default_file); - } else - tmp_name++; - if (direct_sql->tgt_default_group) - { - DBUG_PRINT("info",("spider tgt_default_group=%s", - direct_sql->tgt_default_group)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_default_group); - } else - tmp_name++; - if (direct_sql->tgt_dsn) - { - DBUG_PRINT("info",("spider tgt_dsn=%s", - direct_sql->tgt_dsn)); - tmp_name = strmov(tmp_name + 1, direct_sql->tgt_dsn); - } else - tmp_name++; + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_username); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_password); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_ssl_ca); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_ssl_capath); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_ssl_cert); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_ssl_cipher); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_ssl_key); + counter++; + *tmp_name= (char) counter; + tmp_name++; + *tmp_name = '0' + ((char) direct_sql->tgt_ssl_vsc); + tmp_name++; + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_default_file); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_default_group); + spider_create_conn_key_add_one(&counter, &tmp_name, direct_sql->tgt_dsn); + tmp_name++; #ifdef SPIDER_HAS_HASH_VALUE_TYPE direct_sql->conn_key_hash_value = my_calc_hash(&spider_open_connections, (uchar*) direct_sql->conn_key, direct_sql->conn_key_length); @@ -350,7 +290,7 @@ static inline void spider_maybe_memcpy_string( uint src_len) { *dest_len= src_len; - if (src_len) + if (src) { *dest= tmp; memcpy(*dest, src, src_len); @@ -416,13 +356,12 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn( conn->conn_key_length = direct_sql->conn_key_length; conn->conn_key = tmp_name; memcpy(conn->conn_key, direct_sql->conn_key, direct_sql->conn_key_length); - conn->tgt_wrapper_length = direct_sql->tgt_wrapper_length; - conn->tgt_wrapper = tmp_wrapper; - memcpy(conn->tgt_wrapper, direct_sql->tgt_wrapper, - direct_sql->tgt_wrapper_length); - conn->tgt_host_length = direct_sql->tgt_host_length; - conn->tgt_host = tmp_host; - memcpy(conn->tgt_host, direct_sql->tgt_host, direct_sql->tgt_host_length); + spider_maybe_memcpy_string( + &conn->tgt_wrapper, direct_sql->tgt_wrapper, tmp_wrapper, + &conn->tgt_wrapper_length, direct_sql->tgt_wrapper_length); + spider_maybe_memcpy_string( + &conn->tgt_host, direct_sql->tgt_host, tmp_host, + &conn->tgt_host_length, direct_sql->tgt_host_length); conn->tgt_port = direct_sql->tgt_port; spider_maybe_memcpy_string( &conn->tgt_socket, direct_sql->tgt_socket, tmp_socket, diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index 5c1c0d27820..fc6f3dc23cb 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -999,12 +999,7 @@ int spider_create_string_list( tmp_ptr = str; while (*tmp_ptr == ' ') tmp_ptr++; - if (*tmp_ptr) - *list_length = 1; - else { - *string_list = NULL; - DBUG_RETURN(0); - } + *list_length= 1; bool last_esc_flg = FALSE; while (TRUE) @@ -3820,6 +3815,17 @@ void spider_print_keys( } #endif +void spider_create_conn_key_add_one(int* counter, char** target, char* src) +{ + (*counter)++; + if (src) + { + **target= (char) *counter; + *target= strmov(*target + 1, src); + (*target)++; + } +} + int spider_create_conn_keys( SPIDER_SHARE *share ) { @@ -3881,23 +3887,23 @@ int spider_create_conn_keys( } conn_keys_lengths[roop_count] = 1 - + share->tgt_wrappers_lengths[roop_count] + 1 - + share->tgt_hosts_lengths[roop_count] + 1 - + 5 + 1 - + share->tgt_sockets_lengths[roop_count] + 1 - + (tables_on_different_db_are_joinable ? - 0 : share->tgt_dbs_lengths[roop_count] + 1) - + share->tgt_usernames_lengths[roop_count] + 1 - + share->tgt_passwords_lengths[roop_count] + 1 - + share->tgt_ssl_cas_lengths[roop_count] + 1 - + share->tgt_ssl_capaths_lengths[roop_count] + 1 - + share->tgt_ssl_certs_lengths[roop_count] + 1 - + share->tgt_ssl_ciphers_lengths[roop_count] + 1 - + share->tgt_ssl_keys_lengths[roop_count] + 1 - + 1 + 1 - + share->tgt_default_files_lengths[roop_count] + 1 - + share->tgt_default_groups_lengths[roop_count] + 1 - + share->tgt_dsns_lengths[roop_count]; + + (share->tgt_wrappers[roop_count] ? share->tgt_wrappers_lengths[roop_count] + 2 : 0) + + (share->tgt_hosts[roop_count] ? share->tgt_hosts_lengths[roop_count] + 2 : 0) + + 5 + 2 + + (share->tgt_sockets[roop_count] ? share->tgt_sockets_lengths[roop_count] + 2 : 0) + + (!tables_on_different_db_are_joinable && share->tgt_dbs[roop_count] ? + share->tgt_dbs_lengths[roop_count] + 2 : 0) + + (share->tgt_usernames[roop_count] ? share->tgt_usernames_lengths[roop_count] + 2 : 0) + + (share->tgt_passwords[roop_count] ? share->tgt_passwords_lengths[roop_count] + 2 : 0) + + (share->tgt_ssl_cas[roop_count] ? share->tgt_ssl_cas_lengths[roop_count] + 2 : 0) + + (share->tgt_ssl_capaths[roop_count] ? share->tgt_ssl_capaths_lengths[roop_count] + 2 : 0) + + (share->tgt_ssl_certs[roop_count] ? share->tgt_ssl_certs_lengths[roop_count] + 2 : 0) + + (share->tgt_ssl_ciphers[roop_count] ? share->tgt_ssl_ciphers_lengths[roop_count] + 2 : 0) + + (share->tgt_ssl_keys[roop_count] ? share->tgt_ssl_keys_lengths[roop_count] + 2 : 0) + + 1 + 2 + + (share->tgt_default_files[roop_count] ? share->tgt_default_files_lengths[roop_count] + 2 : 0) + + (share->tgt_default_groups[roop_count] ? share->tgt_default_groups_lengths[roop_count] + 2 : 0) + + (share->tgt_dsns[roop_count] ? share->tgt_dsns_lengths[roop_count] + 2 : 0); share->conn_keys_charlen += conn_keys_lengths[roop_count] + 2; } if (!(share->conn_keys = (char **) @@ -3937,105 +3943,35 @@ int spider_create_conn_keys( share->conn_keys[roop_count] = tmp_name; *tmp_name = '0'; - DBUG_PRINT("info",("spider tgt_wrappers[%d]=%s", roop_count, - share->tgt_wrappers[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_wrappers[roop_count]); - DBUG_PRINT("info",("spider tgt_hosts[%d]=%s", roop_count, - share->tgt_hosts[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_hosts[roop_count]); + tmp_name++; + int counter= 0; + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_wrappers[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_hosts[roop_count]); my_sprintf(port_str, (port_str, "%05ld", share->tgt_ports[roop_count])); - DBUG_PRINT("info",("spider port_str=%s", port_str)); - tmp_name = strmov(tmp_name + 1, port_str); - if (share->tgt_sockets[roop_count]) + spider_create_conn_key_add_one(&counter, &tmp_name, port_str); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_sockets[roop_count]); + counter++; + if (!tables_on_different_db_are_joinable && share->tgt_dbs[roop_count]) { - DBUG_PRINT("info",("spider tgt_sockets[%d]=%s", roop_count, - share->tgt_sockets[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_sockets[roop_count]); - } else + *tmp_name= (char) counter; + tmp_name = strmov(tmp_name + 1, share->tgt_dbs[roop_count]); tmp_name++; - if (!tables_on_different_db_are_joinable) - { - if (share->tgt_dbs[roop_count]) - { - DBUG_PRINT("info",("spider tgt_dbs[%d]=%s", roop_count, - share->tgt_dbs[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_dbs[roop_count]); - } else - tmp_name++; } - if (share->tgt_usernames[roop_count]) - { - DBUG_PRINT("info",("spider tgt_usernames[%d]=%s", roop_count, - share->tgt_usernames[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_usernames[roop_count]); - } else - tmp_name++; - if (share->tgt_passwords[roop_count]) - { - DBUG_PRINT("info",("spider tgt_passwords[%d]=%s", roop_count, - share->tgt_passwords[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_passwords[roop_count]); - } else - tmp_name++; - if (share->tgt_ssl_cas[roop_count]) - { - DBUG_PRINT("info",("spider tgt_ssl_cas[%d]=%s", roop_count, - share->tgt_ssl_cas[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_ssl_cas[roop_count]); - } else - tmp_name++; - if (share->tgt_ssl_capaths[roop_count]) - { - DBUG_PRINT("info",("spider tgt_ssl_capaths[%d]=%s", roop_count, - share->tgt_ssl_capaths[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_ssl_capaths[roop_count]); - } else - tmp_name++; - if (share->tgt_ssl_certs[roop_count]) - { - DBUG_PRINT("info",("spider tgt_ssl_certs[%d]=%s", roop_count, - share->tgt_ssl_certs[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_ssl_certs[roop_count]); - } else - tmp_name++; - if (share->tgt_ssl_ciphers[roop_count]) - { - DBUG_PRINT("info",("spider tgt_ssl_ciphers[%d]=%s", roop_count, - share->tgt_ssl_ciphers[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_ssl_ciphers[roop_count]); - } else - tmp_name++; - if (share->tgt_ssl_keys[roop_count]) - { - DBUG_PRINT("info",("spider tgt_ssl_keys[%d]=%s", roop_count, - share->tgt_ssl_keys[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_ssl_keys[roop_count]); - } else - tmp_name++; + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_usernames[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_passwords[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_ssl_cas[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_ssl_capaths[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_ssl_certs[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_ssl_ciphers[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_ssl_keys[roop_count]); + counter++; + *tmp_name= (char) counter; tmp_name++; *tmp_name = '0' + ((char) share->tgt_ssl_vscs[roop_count]); - if (share->tgt_default_files[roop_count]) - { - DBUG_PRINT("info",("spider tgt_default_files[%d]=%s", roop_count, - share->tgt_default_files[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_default_files[roop_count]); - } else - tmp_name++; - if (share->tgt_default_groups[roop_count]) - { - DBUG_PRINT("info",("spider tgt_default_groups[%d]=%s", roop_count, - share->tgt_default_groups[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_default_groups[roop_count]); - } else - tmp_name++; - if (share->tgt_dsns[roop_count]) - { - DBUG_PRINT("info",("spider tgt_dsns[%d]=%s", roop_count, - share->tgt_dsns[roop_count])); - tmp_name = strmov(tmp_name + 1, share->tgt_dsns[roop_count]); - } else - tmp_name++; tmp_name++; + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_default_files[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_default_groups[roop_count]); + spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_dsns[roop_count]); tmp_name++; #ifdef SPIDER_HAS_HASH_VALUE_TYPE share->conn_keys_hash_value[roop_count] = my_calc_hash( diff --git a/storage/spider/spd_table.h b/storage/spider/spd_table.h index 8ab00212091..b444ba2d3d9 100644 --- a/storage/spider/spd_table.h +++ b/storage/spider/spd_table.h @@ -169,6 +169,8 @@ void spider_print_keys( ); #endif +void spider_create_conn_key_add_one(int* counter, char** target, char* src); + int spider_create_conn_keys( SPIDER_SHARE *share ); From 8416fd323cf69f8fc1d7dcd5bd5e54e504e7f8b9 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Mon, 8 Jul 2024 16:14:44 +0800 Subject: [PATCH 14/33] MDEV-32627 [fixup] Spider: Fix conn key length To avoid off-by-one in spider_get_share. And document conn key and conn key length. --- storage/spider/spd_table.cc | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index fc6f3dc23cb..461e47dd012 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -3826,6 +3826,33 @@ void spider_create_conn_key_add_one(int* counter, char** target, char* src) } } +/* + The conn keys are strings of the following format: + + 0 \ \0 \ \0 ... \ \0 + + Where idx1, idx2, etc. are the index of first, second, etc. options + where the value is specified. We have the wrapper as the first + option, host as the second, port as the third, socket as the fourth, + and so on (see below for the order of all options). So here would be + a conn key where only the host and the port are specified and + nothing else: + + 0\002localhost\000\00303306\000 + + And it has length 1 + 1 + 9 + 1 + 1 + 5 + 1 = 19. + + In case of HA, say we have another link with the same options + specified except that the port is 3307, then we place an extra NUL + before placing the next conn_key: + + 0\002localhost\000\00303306\000\0000\002localhost\000\00303307\000 + ^ ^ + conn_keys[0] conn_keys[1] + + Thus the total number of chars (share->conn_keys_charlen) needed is + (19 + 1) * 2 = 40 +*/ int spider_create_conn_keys( SPIDER_SHARE *share ) { @@ -3904,7 +3931,7 @@ int spider_create_conn_keys( + (share->tgt_default_files[roop_count] ? share->tgt_default_files_lengths[roop_count] + 2 : 0) + (share->tgt_default_groups[roop_count] ? share->tgt_default_groups_lengths[roop_count] + 2 : 0) + (share->tgt_dsns[roop_count] ? share->tgt_dsns_lengths[roop_count] + 2 : 0); - share->conn_keys_charlen += conn_keys_lengths[roop_count] + 2; + share->conn_keys_charlen += conn_keys_lengths[roop_count] + 1; } if (!(share->conn_keys = (char **) spider_bulk_alloc_mem(spider_current_trx, SPD_MID_CREATE_CONN_KEYS_1, @@ -3973,6 +4000,7 @@ int spider_create_conn_keys( spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_default_groups[roop_count]); spider_create_conn_key_add_one(&counter, &tmp_name, share->tgt_dsns[roop_count]); tmp_name++; + tmp_name++; #ifdef SPIDER_HAS_HASH_VALUE_TYPE share->conn_keys_hash_value[roop_count] = my_calc_hash( &spider_open_connections, (uchar*) share->conn_keys[roop_count], From 03a350378ad627d509a31a788896067b02f80e53 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Wed, 17 Jul 2024 08:54:28 +0800 Subject: [PATCH 15/33] MDEV-30408 Reset explicit_limit in exists2in Item_exists_subselect::fix_length_and_dec() sets explicit_limit to 1. In the exists2in transformation it resets select_limit to NULL. For consistency we should reset explicity_limit too. This fixes a bug where spider table returns wrong results for queries that gets through exists2in transformation when semijoin is off. --- sql/item_subselect.cc | 1 + .../spider/bugfix/r/mdev_30408.result | 30 +++++++++++++++++++ .../spider/bugfix/t/mdev_30408.test | 26 ++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_30408.result create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_30408.test diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 7f6e0fbfafc..6dc4cbe16ec 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -3186,6 +3186,7 @@ bool Item_exists_subselect::exists2in_processor(void *opt_arg) set_exists_transformed(); first_select->select_limit= NULL; + first_select->explicit_limit= FALSE; if (!(in_subs= new (thd->mem_root) Item_in_subselect(thd, left_exp, first_select))) { diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_30408.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_30408.result new file mode 100644 index 00000000000..aa44e683102 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_30408.result @@ -0,0 +1,30 @@ +for master_1 +for child2 +for child3 +set @@optimizer_switch="semijoin=off"; +set spider_same_server_link= 1; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); +create table ten(a int primary key); +insert into ten values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +create table t2 (a int, b int); +insert into t2 select a,a from ten; +create table t1 (a int, b int) ENGINE=Spider +COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"'; +select a.a, a.b from t1 a where exists (select * from t1 b where b.b = a.b); +a b +0 0 +1 1 +2 2 +3 3 +4 4 +5 5 +6 6 +7 7 +8 8 +9 9 +drop table ten, t1, t2; +drop server srv; +for master_1 +for child2 +for child3 diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_30408.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_30408.test new file mode 100644 index 00000000000..8f76c1209b6 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_30408.test @@ -0,0 +1,26 @@ +--disable_query_log +--disable_result_log +--source ../../t/test_init.inc +--enable_result_log +--enable_query_log + +set @@optimizer_switch="semijoin=off"; +set spider_same_server_link= 1; +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); + +create table ten(a int primary key); +insert into ten values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +create table t2 (a int, b int); +insert into t2 select a,a from ten; +create table t1 (a int, b int) ENGINE=Spider +COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"'; +select a.a, a.b from t1 a where exists (select * from t1 b where b.b = a.b); +drop table ten, t1, t2; +drop server srv; + +--disable_query_log +--disable_result_log +--source ../../t/test_deinit.inc +--enable_result_log +--enable_query_log From 49dff5a4b62109ba38421e34cf2944ad0fc00a76 Mon Sep 17 00:00:00 2001 From: PinkFreud Date: Thu, 7 Mar 2024 19:09:39 -0500 Subject: [PATCH 16/33] MDEV-34604 mytop - fix specifying filters in .mytop Specifying filters (filter_status, filter_user, etc) in the mytop config previously wouldn't work, because any filter specified here was added to the config hash as a literal string. This change fixes that - if filter_* is defined in the config and matches an existing filter_* key, then run the value through StringOrRegex() and assign to the config hash. --- scripts/mytop.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/mytop.sh b/scripts/mytop.sh index 65bfb8c976e..e5d926ef616 100644 --- a/scripts/mytop.sh +++ b/scripts/mytop.sh @@ -147,7 +147,12 @@ if (-e $config) if (/(\S+)\s*=\s*(.*\S)/) { - $config{lc $1} = $2 if exists $config{lc $1}; + my ($k, $v) = ($1, $2); + if ($k =~ /^filter_/i) { + $config{lc $k} = StringOrRegex($v) if exists $config{lc $k}; + } else { + $config{lc $k} = $v if exists $config{lc $k}; + } } } close CFG; From 383d53edbcaee7762e5e90473cda361b9c9e29d3 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 4 Jun 2024 17:38:14 +0900 Subject: [PATCH 17/33] MDEV-21166 Add Mroonga initialized check to Mroonga UDFs Mroonga UDFs can't be used without loading Mroonga. --- storage/mroonga/ha_mroonga.cpp | 6 ++++ storage/mroonga/mrn.hpp | 29 +++++++++++++++++++ storage/mroonga/sources.am | 1 + storage/mroonga/udf/mrn_udf_command.cpp | 10 +++++++ storage/mroonga/udf/mrn_udf_escape.cpp | 10 +++++++ .../mroonga/udf/mrn_udf_highlight_html.cpp | 9 ++++++ .../udf/mrn_udf_last_insert_grn_id.cpp | 8 +++++ storage/mroonga/udf/mrn_udf_normalize.cpp | 10 +++++++ storage/mroonga/udf/mrn_udf_query_expand.cpp | 10 +++++++ storage/mroonga/udf/mrn_udf_snippet.cpp | 8 +++++ storage/mroonga/udf/mrn_udf_snippet_html.cpp | 9 ++++++ 11 files changed, 110 insertions(+) create mode 100644 storage/mroonga/mrn.hpp diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index 2077b0b8863..75f2387beab 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include "mrn.hpp" #include "mrn_mysql.h" #include "mrn_mysql_compat.h" @@ -296,6 +297,7 @@ static PSI_mutex_info mrn_mutexes[] = #endif /* global variables */ +bool mrn_initialized = false; handlerton *mrn_hton_ptr; HASH mrn_open_tables; mysql_mutex_t mrn_open_tables_mutex; @@ -1957,6 +1959,8 @@ static int mrn_init(void *p) mrn::PathMapper::default_mysql_data_home_path = mysql_data_home; #endif + mrn_initialized = true; + return 0; error_allocated_long_term_share_hash_init: @@ -2051,6 +2055,8 @@ static int mrn_deinit(void *p) mysql_mutex_destroy(&mrn_query_log_mutex); mysql_mutex_destroy(&mrn_log_mutex); + mrn_initialized = false; + return 0; } diff --git a/storage/mroonga/mrn.hpp b/storage/mroonga/mrn.hpp new file mode 100644 index 00000000000..41d3a5df4be --- /dev/null +++ b/storage/mroonga/mrn.hpp @@ -0,0 +1,29 @@ +/* + Copyright (C) 2024 Sutou Kouhei + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +extern bool mrn_initialized; + +#ifdef __cplusplus +} +#endif diff --git a/storage/mroonga/sources.am b/storage/mroonga/sources.am index c7ddcfa5acc..20ab3e6eb7f 100644 --- a/storage/mroonga/sources.am +++ b/storage/mroonga/sources.am @@ -1,4 +1,5 @@ sources = \ + mrn.hpp \ mrn_macro.hpp \ mrn_constants.hpp \ ha_mroonga.cpp \ diff --git a/storage/mroonga/udf/mrn_udf_command.cpp b/storage/mroonga/udf/mrn_udf_command.cpp index 10123c6252d..46911c56e25 100644 --- a/storage/mroonga/udf/mrn_udf_command.cpp +++ b/storage/mroonga/udf/mrn_udf_command.cpp @@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -51,6 +52,15 @@ MRN_API my_bool mroonga_command_init(UDF_INIT *init, UDF_ARGS *args, CommandInfo *info = NULL; init->ptr = NULL; + + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "mroonga_command(): Mroonga isn't initialized"); + goto error; + } + if (args->arg_count == 0) { grn_snprintf(message, MYSQL_ERRMSG_SIZE, diff --git a/storage/mroonga/udf/mrn_udf_escape.cpp b/storage/mroonga/udf/mrn_udf_escape.cpp index 72182790fea..55a3639565e 100644 --- a/storage/mroonga/udf/mrn_udf_escape.cpp +++ b/storage/mroonga/udf/mrn_udf_escape.cpp @@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -44,6 +45,15 @@ MRN_API my_bool mroonga_escape_init(UDF_INIT *init, UDF_ARGS *args, bool script_mode = false; init->ptr = NULL; + + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "mroonga_escape(): Mroonga isn't initialized"); + goto error; + } + if (!(1 <= args->arg_count && args->arg_count <= 2)) { snprintf(message, MYSQL_ERRMSG_SIZE, diff --git a/storage/mroonga/udf/mrn_udf_highlight_html.cpp b/storage/mroonga/udf/mrn_udf_highlight_html.cpp index 12f54a7d16a..d986777caff 100644 --- a/storage/mroonga/udf/mrn_udf_highlight_html.cpp +++ b/storage/mroonga/udf/mrn_udf_highlight_html.cpp @@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -211,6 +212,14 @@ MRN_API my_bool mroonga_highlight_html_init(UDF_INIT *init, init->ptr = NULL; + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "mroonga_highlight_html(): Mroonga isn't initialized"); + goto error; + } + if (args->arg_count < 1) { snprintf(message, MYSQL_ERRMSG_SIZE, "mroonga_highlight_html(): wrong number of arguments: %u for 1+", diff --git a/storage/mroonga/udf/mrn_udf_last_insert_grn_id.cpp b/storage/mroonga/udf/mrn_udf_last_insert_grn_id.cpp index 46176bc8641..f40dcf0055f 100644 --- a/storage/mroonga/udf/mrn_udf_last_insert_grn_id.cpp +++ b/storage/mroonga/udf/mrn_udf_last_insert_grn_id.cpp @@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -29,6 +30,13 @@ MRN_BEGIN_DECLS MRN_API my_bool last_insert_grn_id_init(UDF_INIT *init, UDF_ARGS *args, char *message) { + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "last_insert_grn_id(): Mroonga isn't initialized"); + return 1; + } if (args->arg_count != 0) { strcpy(message, "last_insert_grn_id must not have arguments"); return 1; diff --git a/storage/mroonga/udf/mrn_udf_normalize.cpp b/storage/mroonga/udf/mrn_udf_normalize.cpp index 303623516f1..0ebee2ff608 100644 --- a/storage/mroonga/udf/mrn_udf_normalize.cpp +++ b/storage/mroonga/udf/mrn_udf_normalize.cpp @@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -53,6 +54,15 @@ MRN_API my_bool mroonga_normalize_init(UDF_INIT *init, UDF_ARGS *args, String *result_str = NULL; init->ptr = NULL; + + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "mroonga_normalize(): Mroonga isn't initialized"); + goto error; + } + if (!(1 <= args->arg_count && args->arg_count <= 2)) { sprintf(message, "mroonga_normalize(): Incorrect number of arguments: %u for 1..2", diff --git a/storage/mroonga/udf/mrn_udf_query_expand.cpp b/storage/mroonga/udf/mrn_udf_query_expand.cpp index 03bef3215c7..76a5dad53b4 100644 --- a/storage/mroonga/udf/mrn_udf_query_expand.cpp +++ b/storage/mroonga/udf/mrn_udf_query_expand.cpp @@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -74,6 +75,15 @@ MRN_API my_bool mroonga_query_expand_init(UDF_INIT *init, MRN_DBUG_ENTER_FUNCTION(); init->ptr = NULL; + + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "mroonga_query_expand(): Mroonga isn't initialized"); + goto error; + } + if (args->arg_count != 4) { sprintf(message, "mroonga_query_expand(): wrong number of arguments: %u for 4", diff --git a/storage/mroonga/udf/mrn_udf_snippet.cpp b/storage/mroonga/udf/mrn_udf_snippet.cpp index a4b37d03a4f..45e539f0093 100644 --- a/storage/mroonga/udf/mrn_udf_snippet.cpp +++ b/storage/mroonga/udf/mrn_udf_snippet.cpp @@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -135,6 +136,13 @@ MRN_API my_bool mroonga_snippet_init(UDF_INIT *init, UDF_ARGS *args, char *messa st_mrn_snip_info *snip_info = NULL; bool can_open_snippet = TRUE; init->ptr = NULL; + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "mroonga_snippet(): Mroonga isn't initialized"); + goto error; + } if (args->arg_count < 11 || (args->arg_count - 11) % 3) { sprintf(message, "Incorrect number of arguments for mroonga_snippet(): %u", diff --git a/storage/mroonga/udf/mrn_udf_snippet_html.cpp b/storage/mroonga/udf/mrn_udf_snippet_html.cpp index 311c91bf665..ba0cdadda99 100644 --- a/storage/mroonga/udf/mrn_udf_snippet_html.cpp +++ b/storage/mroonga/udf/mrn_udf_snippet_html.cpp @@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include #include #include #include @@ -194,6 +195,14 @@ MRN_API my_bool mroonga_snippet_html_init(UDF_INIT *init, init->ptr = NULL; + if (!mrn_initialized) + { + snprintf(message, + MYSQL_ERRMSG_SIZE, + "mroonga_snippet_html(): Mroonga isn't initialized"); + goto error; + } + if (args->arg_count < 1) { snprintf(message, MYSQL_ERRMSG_SIZE, "mroonga_snippet_html(): wrong number of arguments: %u for 1+", From b777b749ad57b11f3e0f0adc96ce06e50e704d23 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 17 Jul 2024 08:39:43 +0400 Subject: [PATCH 18/33] MDEV-28345 ASAN: use-after-poison or unknown-crash in my_strtod_int from charset_info_st::strntod or test_if_number This patch fixes two problems: - The code inside my_strtod_int() in strings/dtoa.c could test the byte behind the end of the string when processing the mantissa. Rewriting the code to avoid this. - The code in test_if_number() in sql/sql_analyse.cc called my_atof() which is unsafe and makes the called my_strtod_int() look behind the end of the string if the input string is not 0-terminated. Fixing test_if_number() to use my_strtod() instead, passing the correct end pointer. --- mysql-test/main/func_analyse.result | 19 +++++++++++++++++++ mysql-test/main/func_analyse.test | 20 ++++++++++++++++++++ mysql-test/main/type_num_innodb.result | 24 ++++++++++++++++++++++++ mysql-test/main/type_num_innodb.test | 19 +++++++++++++++++++ sql/sql_analyse.cc | 4 +++- strings/dtoa.c | 18 +++++++++--------- 6 files changed, 94 insertions(+), 10 deletions(-) diff --git a/mysql-test/main/func_analyse.result b/mysql-test/main/func_analyse.result index 1cb9e3c9ad8..2c7ec0b131e 100644 --- a/mysql-test/main/func_analyse.result +++ b/mysql-test/main/func_analyse.result @@ -222,3 +222,22 @@ DROP TABLE t1; # # End of 10.4 tests # +# +# Start of 10.5 tests +# +# +# MDEV-28345 ASAN: use-after-poison or unknown-crash in my_strtod_int from charset_info_st::strntod or test_if_number +# +SET sql_mode=''; +CREATE TABLE t1 (c CHAR(10) KEY); +INSERT INTO t1 VALUES (1.755555555); +Warnings: +Warning 1265 Data truncated for column 'c' at row 1 +SELECT * FROM t1 PROCEDURE ANALYSE(); +Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype +test.t1.c 1.75555555 1.75555555 10 10 0 0 10.0000 NULL ENUM('1.75555555') NOT NULL +DROP TABLE t1; +SET sql_mode=DEFAULT; +# +# End of 10.5 tests +# diff --git a/mysql-test/main/func_analyse.test b/mysql-test/main/func_analyse.test index 3c8be90d6e2..fb243c5a31c 100644 --- a/mysql-test/main/func_analyse.test +++ b/mysql-test/main/func_analyse.test @@ -230,3 +230,23 @@ DROP TABLE t1; --echo # --echo # End of 10.4 tests --echo # + + +--echo # +--echo # Start of 10.5 tests +--echo # + +--echo # +--echo # MDEV-28345 ASAN: use-after-poison or unknown-crash in my_strtod_int from charset_info_st::strntod or test_if_number +--echo # + +SET sql_mode=''; +CREATE TABLE t1 (c CHAR(10) KEY); +INSERT INTO t1 VALUES (1.755555555); +SELECT * FROM t1 PROCEDURE ANALYSE(); +DROP TABLE t1; +SET sql_mode=DEFAULT; + +--echo # +--echo # End of 10.5 tests +--echo # diff --git a/mysql-test/main/type_num_innodb.result b/mysql-test/main/type_num_innodb.result index 92dc705de90..74396081891 100644 --- a/mysql-test/main/type_num_innodb.result +++ b/mysql-test/main/type_num_innodb.result @@ -88,3 +88,27 @@ DROP TABLE t1,t2; # # End of 10.2 tests # +# +# Start of 10.5 tests +# +# +# MDEV-28345 ASAN: use-after-poison or unknown-crash in my_strtod_int from charset_info_st::strntod or test_if_number +# +CREATE TABLE t1 (c BLOB) ENGINE=InnoDB; +INSERT INTO t1 VALUES ('0.0e'),('0.0e+0'); +SELECT * FROM t1 WHERE COALESCE(c)=0.0; +c +0.0e +0.0e+0 +Warnings: +Warning 1292 Truncated incorrect DOUBLE value: '0.0e' +SELECT * FROM t1 WHERE COALESCE(c)=0.0e0; +c +0.0e +0.0e+0 +Warnings: +Warning 1292 Truncated incorrect DOUBLE value: '0.0e' +DROP TABLE t1; +# +# End of 10.5 tests +# diff --git a/mysql-test/main/type_num_innodb.test b/mysql-test/main/type_num_innodb.test index 04bdd4c63b0..57bb3d178f5 100644 --- a/mysql-test/main/type_num_innodb.test +++ b/mysql-test/main/type_num_innodb.test @@ -39,3 +39,22 @@ DROP TABLE t1,t2; --echo # --echo # End of 10.2 tests --echo # + + +--echo # +--echo # Start of 10.5 tests +--echo # + +--echo # +--echo # MDEV-28345 ASAN: use-after-poison or unknown-crash in my_strtod_int from charset_info_st::strntod or test_if_number +--echo # + +CREATE TABLE t1 (c BLOB) ENGINE=InnoDB; +INSERT INTO t1 VALUES ('0.0e'),('0.0e+0'); +SELECT * FROM t1 WHERE COALESCE(c)=0.0; +SELECT * FROM t1 WHERE COALESCE(c)=0.0e0; +DROP TABLE t1; + +--echo # +--echo # End of 10.5 tests +--echo # diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index 8e833035b96..8dfa1c06d7f 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -258,7 +258,9 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len) info->decimals++; if (str == end) { - info->dval = my_atof(begin); + int error; + const char *end2= end; + info->dval= my_strtod(begin, (char **) &end2, &error); DBUG_RETURN(1); } } diff --git a/strings/dtoa.c b/strings/dtoa.c index 9bdeeacf574..21eb95479da 100644 --- a/strings/dtoa.c +++ b/strings/dtoa.c @@ -1465,22 +1465,22 @@ static double my_strtod_int(const char *s00, char **se, int *error, char *buf, s s00= s; esign= 0; if (++s < end) - switch (c= *s) { + switch (*s) { case '-': esign= 1; /* fall through */ - case '+': c= *++s; + case '+': s++; } - if (s < end && c >= '0' && c <= '9') + if (s < end && *s >= '0' && *s <= '9') { - while (s < end && c == '0') - c= *++s; - if (s < end && c > '0' && c <= '9') { - L= c - '0'; + while (s < end && *s == '0') + s++; + if (s < end && *s > '0' && *s <= '9') { + L= *s - '0'; s1= s; - while (++s < end && (c= *s) >= '0' && c <= '9') + while (++s < end && *s >= '0' && *s <= '9') { if (L < 19999) - L= 10*L + c - '0'; + L= 10*L + *s - '0'; } if (s - s1 > 8 || L > 19999) /* Avoid confusion from exponents From 7478fabcff127e52282e211632938067f75213bb Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Wed, 17 Jul 2024 09:02:58 +0200 Subject: [PATCH 19/33] new PCRE2-10.44 --- cmake/pcre.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake index 70ea92f1746..89f928f684a 100644 --- a/cmake/pcre.cmake +++ b/cmake/pcre.cmake @@ -54,8 +54,8 @@ MACRO(BUNDLE_PCRE2) ExternalProject_Add( pcre2 PREFIX "${dir}" - URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43/pcre2-10.43.zip" - URL_MD5 b58f050f2fdd6f2ca5774a2975377a85 + URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.zip" + URL_MD5 dfab8313154b3377a6959c3b6377841e INSTALL_COMMAND "" CMAKE_ARGS "-DCMAKE_WARN_DEPRECATED=FALSE" From e7c2e25ba82cafcacecac8c2927ab5d1f7d3c305 Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Wed, 17 Jul 2024 13:08:55 +0200 Subject: [PATCH 20/33] new CC version --- libmariadb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmariadb b/libmariadb index 51b2a621b3d..6dfc071d356 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit 51b2a621b3d5ef949098dcb7912048caaf878793 +Subproject commit 6dfc071d3567eeace321f022dc0ed311d02c7ed7 From 008bddaa6c81fe30071475c24253950a4144863e Mon Sep 17 00:00:00 2001 From: Robin Newhouse Date: Mon, 3 Jun 2024 19:43:21 +0000 Subject: [PATCH 21/33] GitLab CI Upgrade CentOS 8 to CentOS 9 build > After May 31, 2024, CentOS Stream 8 will be archived and no further updates will be provided. [1] CentOS Stream 8 is now EOL and should be updated to using CentOS Stream 9 for compatibility testing in GitLab CI. [1] https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/ https://www.centos.org/centos-linux-eol/ All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services. --- .gitlab-ci.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c6f5c2e9ed..46c7ed078f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ variables: # Major version dictates which branches share the same ccache. E.g. 10.6-abc # and 10.6-xyz will have the same cache. MARIADB_MAJOR_VERSION: "10.5" - # NOTE! Currently ccache is only used on the Centos8 build. As each job has + # NOTE! Currently ccache is only used on the Centos 9 build. As each job has # sufficiently different environments they are unable to benefit from each # other's ccaches. As each build generates about 1 GB of ccache, having # multiple caches would quickly consume all free storage on Gitlab-CI and @@ -53,7 +53,7 @@ variables: # cache:policy are not flexible enough to have a system where the cache is # uploaded only once a week and not on every build. Having ccache on at least # one build still helps ensure that ccache compatibility is at least tested - # and if the Centos 8 build is always significantly faster than all other + # and if the Centos 9 build is always significantly faster than all other # builds (e.g. on self-hosted Gitlab instances) then users would at least be # able to discover it. # @@ -209,26 +209,20 @@ fedora-sanitizer: matrix: - SANITIZER: [-DWITH_ASAN=YES, -DWITH_TSAN=YES, -DWITH_UBSAN=YES] -centos8: +centos9: stage: build - image: quay.io/centos/centos:stream8 # CentOS 8 is deprecated, use this Stream8 instead + image: quay.io/centos/centos:stream9 # CentOS 9 is deprecated, use this Stream9 instead variables: GIT_STRATEGY: fetch GIT_SUBMODULE_STRATEGY: normal script: - - yum install -y yum-utils rpm-build openssl-devel pcre2-devel - - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - # dnf --enablerepo=powertools install Judy-devel #--> not found - - dnf config-manager --set-enabled powertools - # Error: - # Problem: conflicting requests - # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.i686 is filtered out by modular filtering - # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64 is filtered out by modular filtering - # Solution: install Judy-devel directly from downloaded rpm file: - - yum install -y http://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm - # Use eatmydata to speed up build - - yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm - - yum install -y ccache # From EPEL + - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm + - yum install -y yum-utils rpm-build openssl-devel libeatmydata ccache + # Install missing dependencies + - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/Judy-devel-1.0.5-28.el9.x86_64.rpm + - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/bison-devel-3.7.4-5.el9.x86_64.rpm + - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/multilib-rpm-config-1-19.el9.noarch.rpm + # Configure ccache - source /etc/profile.d/ccache.sh - export CCACHE_DIR="$(pwd)/.ccache"; ccache --zero-stats # This repository does not have any .spec files, so install dependencies based on CentOS spec file From 4a89f79b6aa05aed2ae39f0a3c968c4bb5196043 Mon Sep 17 00:00:00 2001 From: Souradeep Saha Date: Fri, 21 Jun 2024 17:17:47 +0000 Subject: [PATCH 22/33] Refactor import * with only required imports Import only the required functions instead of all the functions from the module to reduce the unnecessary functions in the namespace and prevent shadowing. Note: All code changes are non-functional. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc. --- debian/additions/source_mariadb-10.5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/additions/source_mariadb-10.5.py b/debian/additions/source_mariadb-10.5.py index eac7a054b84..68a75c467d6 100644 --- a/debian/additions/source_mariadb-10.5.py +++ b/debian/additions/source_mariadb-10.5.py @@ -7,7 +7,7 @@ Author: Mathias Gug from __future__ import print_function, unicode_literals import os, os.path -from apport.hookutils import * +from apport.hookutils import path_to_key, read_file, attach_conffiles, attach_mac_events, attach_file def _add_my_conf_files(report, filename): key = 'MySQLConf' + path_to_key(filename) From 1f28350b59e022b4e968dd880d8f2de2def9f5f5 Mon Sep 17 00:00:00 2001 From: Rucha Deodhar Date: Tue, 9 Jul 2024 23:44:44 +0530 Subject: [PATCH 23/33] MDEV-32456: incorrect result of gis function in view protocol There are 3 diff in result: 1) NULL value from SELECT Due to incorrect truncating of the hex value, incorrect value is written instead of original value to the view frm. This results in reading incorrect value from frm, so eventual result is NULL. 2) 'Name_exp1' in column name (in gis.test) This was because the identifier in SELECT is longer than 64 characters, so 'Name_exp1' alias is also written to the view frm. 3)diff in explain extended This was because the query plan for view protocol doesn't contain database name. As a fix, disable view protocol for that particular query. --- mysql-test/include/gis_generic.inc | 2 ++ mysql-test/suite/innodb_gis/r/1.result | 12 ++++++------ mysql-test/suite/innodb_gis/r/gis.result | 12 ++++++------ mysql-test/suite/innodb_gis/t/1.test | 11 ++++++++--- mysql-test/suite/innodb_gis/t/geometry.test | 3 +++ mysql-test/suite/innodb_gis/t/gis.test | 11 ++++++++--- sql/item.cc | 4 +--- 7 files changed, 34 insertions(+), 21 deletions(-) diff --git a/mysql-test/include/gis_generic.inc b/mysql-test/include/gis_generic.inc index 8209240614e..80fdb6f324e 100644 --- a/mysql-test/include/gis_generic.inc +++ b/mysql-test/include/gis_generic.inc @@ -142,11 +142,13 @@ Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +--disable_view_protocol explain extended SELECT g1.fid as first, g2.fid as second, Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +--enable_view_protocol DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; diff --git a/mysql-test/suite/innodb_gis/r/1.result b/mysql-test/suite/innodb_gis/r/1.result index 6db6407b5db..909051cc54e 100644 --- a/mysql-test/suite/innodb_gis/r/1.result +++ b/mysql-test/suite/innodb_gis/r/1.result @@ -433,8 +433,8 @@ gc geometrycollection YES NULL gm geometry YES NULL fid int(11) NO NULL DROP TABLE t1; -SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); -ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))) +SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))) AS val; +val POINT(1 4) explain extended SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); id select_type table type possible_keys key key_len ref rows filtered Extra @@ -668,11 +668,11 @@ ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field insert into t1 values (ST_pointfromtext('point(1,1)')); ERROR 23000: Column 'fl' cannot be null drop table t1; -select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))); -(ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))) +select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))) AS val; +val POINT(10 10) -select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))); -(ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))) +select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))) AS val; +val POINT(10 10) create table t1 (g GEOMETRY); select * from t1; diff --git a/mysql-test/suite/innodb_gis/r/gis.result b/mysql-test/suite/innodb_gis/r/gis.result index 2a31a6c5317..e7f735b5094 100644 --- a/mysql-test/suite/innodb_gis/r/gis.result +++ b/mysql-test/suite/innodb_gis/r/gis.result @@ -433,8 +433,8 @@ gc geometrycollection YES NULL gm geometry YES NULL fid int(11) NO NULL DROP TABLE t1; -SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); -ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))) +SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))) AS val; +val POINT(1 4) explain extended SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); id select_type table type possible_keys key key_len ref rows filtered Extra @@ -668,11 +668,11 @@ ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field insert into t1 values (ST_pointfromtext('point(1,1)')); ERROR 23000: Column 'fl' cannot be null drop table t1; -select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))); -(ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))) +select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))) AS val; +val POINT(10 10) -select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))); -(ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))) +select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))) AS val; +val POINT(10 10) create table t1 (g GEOMETRY); select * from t1; diff --git a/mysql-test/suite/innodb_gis/t/1.test b/mysql-test/suite/innodb_gis/t/1.test index f08fdaddbda..3a5103860e1 100644 --- a/mysql-test/suite/innodb_gis/t/1.test +++ b/mysql-test/suite/innodb_gis/t/1.test @@ -136,17 +136,20 @@ SELECT fid, ST_AsText(ST_GeometryN(g, 1)) from gis_geometrycollection; --replace_column 10 # explain extended SELECT fid, ST_AsText(ST_GeometryN(g, 2)) from gis_multi_point; +--disable_view_protocol SELECT g1.fid as first, g2.fid as second, MBRWithin(g1.g, g2.g) as w, MBRContains(g1.g, g2.g) as c, MBROverlaps(g1.g, g2.g) as o, MBREquals(g1.g, g2.g) as e, MBRDisjoint(g1.g, g2.g) as d, ST_Touches(g1.g, g2.g) as t, MBRIntersects(g1.g, g2.g) as i, ST_Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; + --replace_column 10 # explain extended SELECT g1.fid as first, g2.fid as second, MBRWithin(g1.g, g2.g) as w, MBRContains(g1.g, g2.g) as c, MBROverlaps(g1.g, g2.g) as o, MBREquals(g1.g, g2.g) as e, MBRDisjoint(g1.g, g2.g) as d, ST_Touches(g1.g, g2.g) as t, MBRIntersects(g1.g, g2.g) as i, ST_Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +--enable_view_protocol DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; @@ -169,7 +172,7 @@ ALTER TABLE t1 ADD fid INT NOT NULL; SHOW FIELDS FROM t1; DROP TABLE t1; -SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); +SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))) AS val; explain extended SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); explain extended SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_PointFromText('POINT(1 4)')))); SELECT ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101)); @@ -398,14 +401,16 @@ insert into t1 values (ST_pointfromtext('point(1,1)')); drop table t1; -select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))); -select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))); +select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))) AS val; +select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))) AS val; +--disable_view_protocol --enable_metadata create table t1 (g GEOMETRY); select * from t1; select ST_asbinary(g) from t1; --disable_metadata +--enable_view_protocol drop table t1; create table t1 (a TEXT, b GEOMETRY NOT NULL, INDEX(b(5))); diff --git a/mysql-test/suite/innodb_gis/t/geometry.test b/mysql-test/suite/innodb_gis/t/geometry.test index 3efc664fbd2..0d9b445be67 100644 --- a/mysql-test/suite/innodb_gis/t/geometry.test +++ b/mysql-test/suite/innodb_gis/t/geometry.test @@ -623,17 +623,20 @@ SELECT fid, ST_AsText(ST_GeometryN(g, 1)) from gis_geometrycollection; --replace_column 10 # explain extended SELECT fid, ST_AsText(ST_GeometryN(g, 2)) from gis_multi_point; +--disable_view_protocol SELECT g1.fid as first, g2.fid as second, MBRWithin(g1.g, g2.g) as w, MBRContains(g1.g, g2.g) as c, MBROverlaps(g1.g, g2.g) as o, MBREquals(g1.g, g2.g) as e, MBRDisjoint(g1.g, g2.g) as d, ST_Touches(g1.g, g2.g) as t, MBRIntersects(g1.g, g2.g) as i, ST_Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; + --replace_column 10 # explain extended SELECT g1.fid as first, g2.fid as second, MBRWithin(g1.g, g2.g) as w, MBRContains(g1.g, g2.g) as c, MBROverlaps(g1.g, g2.g) as o, MBREquals(g1.g, g2.g) as e, MBRDisjoint(g1.g, g2.g) as d, ST_Touches(g1.g, g2.g) as t, MBRIntersects(g1.g, g2.g) as i, ST_Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +--enable_view_protocol --echo # check support of Foreign Key constraint CREATE TABLE parent (id GEOMETRY NOT NULL,PRIMARY KEY (id(10))) ENGINE=INNODB; diff --git a/mysql-test/suite/innodb_gis/t/gis.test b/mysql-test/suite/innodb_gis/t/gis.test index 851e82308c6..ea9de7edfff 100644 --- a/mysql-test/suite/innodb_gis/t/gis.test +++ b/mysql-test/suite/innodb_gis/t/gis.test @@ -135,17 +135,20 @@ SELECT fid, ST_AsText(ST_GeometryN(g, 1)) from gis_geometrycollection; --replace_column 10 # explain extended SELECT fid, ST_AsText(ST_GeometryN(g, 2)) from gis_multi_point; +--disable_view_protocol SELECT g1.fid as first, g2.fid as second, MBRWithin(g1.g, g2.g) as w, MBRContains(g1.g, g2.g) as c, MBROverlaps(g1.g, g2.g) as o, MBREquals(g1.g, g2.g) as e, MBRDisjoint(g1.g, g2.g) as d, ST_Touches(g1.g, g2.g) as t, MBRIntersects(g1.g, g2.g) as i, ST_Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; + --replace_column 10 # explain extended SELECT g1.fid as first, g2.fid as second, MBRWithin(g1.g, g2.g) as w, MBRContains(g1.g, g2.g) as c, MBROverlaps(g1.g, g2.g) as o, MBREquals(g1.g, g2.g) as e, MBRDisjoint(g1.g, g2.g) as d, ST_Touches(g1.g, g2.g) as t, MBRIntersects(g1.g, g2.g) as i, ST_Crosses(g1.g, g2.g) as r FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second; +--enable_view_protocol DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry; @@ -168,7 +171,7 @@ ALTER TABLE t1 ADD fid INT NOT NULL; SHOW FIELDS FROM t1; DROP TABLE t1; -SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); +SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))) AS val; explain extended SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_GeometryFromText('POINT(1 4)')))); explain extended SELECT ST_AsText(ST_GeometryFromWKB(ST_AsWKB(ST_PointFromText('POINT(1 4)')))); SELECT ST_SRID(ST_GeomFromText('LineString(1 1,2 2)',101)); @@ -393,14 +396,16 @@ insert into t1 values (ST_pointfromtext('point(1,1)')); drop table t1; -select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))); -select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))); +select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))) AS val; +select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))) AS val; +--disable_view_protocol --enable_metadata create table t1 (g GEOMETRY); select * from t1; select ST_asbinary(g) from t1; --disable_metadata +--enable_view_protocol drop table t1; create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b)); diff --git a/sql/item.cc b/sql/item.cc index 063003ee6bf..9ba00944c85 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7278,10 +7278,8 @@ void Item_hex_constant::hex_string_init(THD *thd, const char *str, size_t str_le void Item_hex_hybrid::print(String *str, enum_query_type query_type) { - uint32 len= MY_MIN(str_value.length(), sizeof(longlong)); - const char *ptr= str_value.ptr() + str_value.length() - len; str->append("0x"); - str->append_hex(ptr, len); + str->append_hex(str_value.ptr(), str_value.length()); } From 8ac30517af11cd40e6098e91e7f31268ef857b99 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 14 Jun 2024 17:23:55 +0200 Subject: [PATCH 24/33] MDEV-34384 restorecon call in RPM POSTIN script has hardcoded datadir path --- support-files/rpm/server-postin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index 525af219c9b..5a66381d593 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -71,7 +71,7 @@ if [ -x /usr/sbin/semodule ] ; then /usr/sbin/semodule -i /usr/share/mysql/policy/selinux/mariadb.pp fi -if [ -x /sbin/restorecon ] ; then +if [ -x /sbin/restorecon -a -d /var/lib/mysql ] ; then /sbin/restorecon -R /var/lib/mysql fi From dea5746de2e604bb1c15892d7f77593e6d7145a2 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 16 Jun 2024 18:04:27 +0200 Subject: [PATCH 25/33] MDEV-32155 MariaDB Server crashes with ill-formed partitions for ALTER_PARTITION_ADMIN (CHECK/REPAIR/LOAD INDEX/CACHE INDEX/etc) partitioning marks affected partitions with PART_ADMIN state. The assumption is that the server will call a corresponding method of ha_partition which will reset the state back to PART_NORMAL. This assumption is invalid, the server is not required to do so, indeed, in CHECK ... FOR UPGRADE the server might decide early that the table is fine and won't call ha_partition::check(), leaving partitions in the wrong state. It will thus leak into the next statement confusing the engine about what it is doing (see ha_partition::create_handler_file()), causing a crash later. Let's force all partitions into PART_NORMAL state after the admin operation succeeded, in case it did so without consulting the engine. --- mysql-test/main/partition_key_cache.result | 1 - mysql-test/main/partition_key_cache.test | 4 ---- mysql-test/main/partition_mgm_err.result | 13 ++++++++++++- mysql-test/main/partition_mgm_err.test | 17 +++++++++++++---- sql/sql_admin.cc | 4 ++++ 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/mysql-test/main/partition_key_cache.result b/mysql-test/main/partition_key_cache.result index fae7639d9bb..94fa099447b 100644 --- a/mysql-test/main/partition_key_cache.result +++ b/mysql-test/main/partition_key_cache.result @@ -1,4 +1,3 @@ -DROP TABLE IF EXISTS t1, t2, v, x; # Actual test of key caches # Verifing that reads/writes use the key cache correctly SET @org_key_cache_buffer_size= @@global.default.key_buffer_size; diff --git a/mysql-test/main/partition_key_cache.test b/mysql-test/main/partition_key_cache.test index 365a571ae92..a4178d62d65 100644 --- a/mysql-test/main/partition_key_cache.test +++ b/mysql-test/main/partition_key_cache.test @@ -1,10 +1,6 @@ # Test of key cache with partitions --source include/have_partition.inc ---disable_warnings -DROP TABLE IF EXISTS t1, t2, v, x; ---enable_warnings - --echo # Actual test of key caches --echo # Verifing that reads/writes use the key cache correctly SET @org_key_cache_buffer_size= @@global.default.key_buffer_size; diff --git a/mysql-test/main/partition_mgm_err.result b/mysql-test/main/partition_mgm_err.result index 01adc4f5adf..2d523998985 100644 --- a/mysql-test/main/partition_mgm_err.result +++ b/mysql-test/main/partition_mgm_err.result @@ -1,4 +1,3 @@ -drop table if exists t1; CREATE TABLE t1 (a int, b int) PARTITION BY RANGE (a) (PARTITION x0 VALUES LESS THAN (2), @@ -158,3 +157,15 @@ PARTITION p1 VALUES IN (0) (SUBPARTITION p1b), PARTITION p2 VALUES IN (2) (SUBPARTITION p1b) ); ERROR HY000: Duplicate partition name p1b +# End of 5.5 tests +# +# MDEV-32155 MariaDB Server crashes with ill-formed partitions +# +create table t1 (c1 set ( 'abc' ) binary unicode) partition by linear hash (c1 mod c1) partitions 10; +alter table t1 check partition all for upgrade; +Table Op Msg_type Msg_text +test.t1 check status OK +alter table t1 order by nonexistent; +ERROR 42S22: Unknown column 'nonexistent' in 'order clause' +drop table t1; +# End of 10.5 tests diff --git a/mysql-test/main/partition_mgm_err.test b/mysql-test/main/partition_mgm_err.test index 0987c427fc7..61cb82f0c7a 100644 --- a/mysql-test/main/partition_mgm_err.test +++ b/mysql-test/main/partition_mgm_err.test @@ -4,10 +4,6 @@ # -- source include/have_partition.inc ---disable_warnings -drop table if exists t1; ---enable_warnings - # # Try faulty DROP PARTITION and COALESCE PARTITION # @@ -223,3 +219,16 @@ SUBPARTITION BY KEY (s2) ( PARTITION p1 VALUES IN (0) (SUBPARTITION p1b), PARTITION p2 VALUES IN (2) (SUBPARTITION p1b) ); + +--echo # End of 5.5 tests + +--echo # +--echo # MDEV-32155 MariaDB Server crashes with ill-formed partitions +--echo # +create table t1 (c1 set ( 'abc' ) binary unicode) partition by linear hash (c1 mod c1) partitions 10; +alter table t1 check partition all for upgrade; +--error ER_BAD_FIELD_ERROR +alter table t1 order by nonexistent; +drop table t1; + +--echo # End of 10.5 tests diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 3b1ee878b50..9e8d36c475b 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -875,6 +875,10 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, result_code = (table->table->file->*operator_func)(thd, check_opt); THD_STAGE_INFO(thd, stage_sending_data); DBUG_PRINT("admin", ("operator_func returned: %d", result_code)); +#ifdef WITH_PARTITION_STORAGE_ENGINE + if (lex->alter_info.partition_flags & ALTER_PARTITION_ADMIN) + set_part_state(&lex->alter_info, table->table->part_info, PART_NORMAL); +#endif } if (compl_result_code == HA_ADMIN_OK && collect_eis) From d60f5c11ea9008fa57444327526e3d2c8633ba06 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 14 Jun 2024 17:32:52 +0200 Subject: [PATCH 26/33] MDEV-34318 mariadb-dump SQL syntax error with MAX_STATEMENT_TIME against Percona MySQL server protect MariaDB conditional comments from a bug in Percona MySQL comment parser --- client/mysqldump.c | 4 +- mysql-test/main/column_compression.result | 288 ++++---- .../main/column_compression_parts.result | 14 +- .../main/mysqlbinlog_row_compressed.result | 26 +- .../main/mysqlbinlog_row_minimal.result | 34 +- .../main/mysqlbinlog_stmt_compressed.result | 26 +- .../binlog/r/binlog_mysqlbinlog_row.result | 666 +++++++++--------- .../r/binlog_mysqlbinlog_row_innodb.result | 76 +- .../r/binlog_mysqlbinlog_row_myisam.result | 76 +- .../r/binlog_mysqlbinlog_row_trans.result | 38 +- .../suite/binlog/r/binlog_row_annotate.result | 144 ++-- .../binlog/r/binlog_row_ctype_ucs.result | 22 +- .../r/binlog_row_mysqlbinlog_options.result | 52 +- .../binlog/r/binlog_stm_ctype_ucs.result | 22 +- mysql-test/suite/binlog/r/flashback.result | 18 +- .../binlog_row_annotate.result | 72 +- .../compat/oracle/r/column_compression.result | 250 +++---- .../rpl/r/rpl_blackhole_row_annotate.result | 44 +- sql/field.h | 4 +- sql/log_event_client.cc | 8 +- 20 files changed, 942 insertions(+), 942 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index 1c9d92d6e09..867bb620b00 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -6951,11 +6951,11 @@ int main(int argc, char **argv) write_header(md_result_file, *argv); /* Set MAX_STATEMENT_TIME to 0 unless set in client */ - my_snprintf(query, sizeof(query), "/*!100100 SET @@MAX_STATEMENT_TIME=%f */", opt_max_statement_time); + my_snprintf(query, sizeof(query), "/*M!100100 SET @@MAX_STATEMENT_TIME=%f */", opt_max_statement_time); mysql_query(mysql, query); /* Set server side timeout between client commands to server compiled-in default */ - mysql_query(mysql, "/*!100100 SET WAIT_TIMEOUT=DEFAULT */"); + mysql_query(mysql, "/*M!100100 SET WAIT_TIMEOUT=DEFAULT */"); /* Check if the server support multi source */ if (mysql_get_server_version(mysql) >= 100000) diff --git a/mysql-test/main/column_compression.result b/mysql-test/main/column_compression.result index da6dfdc51f4..f7b02639af3 100644 --- a/mysql-test/main/column_compression.result +++ b/mysql-test/main/column_compression.result @@ -8,7 +8,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # Make sure column was actually compressed INSERT INTO t1 VALUES(REPEAT('a', 1000)); @@ -44,7 +44,7 @@ ALTER TABLE t1 MODIFY COLUMN a BLOB COMPRESSED; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -61,7 +61,7 @@ CREATE TABLE t2 LIKE t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # Make sure implicit CREATE TABLE ... SELECT inherits compression @@ -69,7 +69,7 @@ CREATE TABLE t2 SELECT * FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t2; LEFT(a, 10) LENGTH(a) @@ -105,7 +105,7 @@ ALTER TABLE t1 ENGINE=InnoDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -223,7 +223,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # Make sure column was actually compressed INSERT INTO t1 VALUES(REPEAT('a', 1000)); @@ -259,7 +259,7 @@ ALTER TABLE t1 MODIFY COLUMN a TEXT COMPRESSED; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -276,7 +276,7 @@ CREATE TABLE t2 LIKE t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # Make sure implicit CREATE TABLE ... SELECT inherits compression @@ -284,7 +284,7 @@ CREATE TABLE t2 SELECT * FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t2; LEFT(a, 10) LENGTH(a) @@ -320,7 +320,7 @@ ALTER TABLE t1 ENGINE=InnoDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -438,7 +438,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # Make sure column was actually compressed INSERT INTO t1 VALUES(REPEAT('a', 1000)); @@ -474,7 +474,7 @@ ALTER TABLE t1 MODIFY COLUMN a VARBINARY(10000) COMPRESSED; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -491,7 +491,7 @@ CREATE TABLE t2 LIKE t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # Make sure implicit CREATE TABLE ... SELECT inherits compression @@ -499,7 +499,7 @@ CREATE TABLE t2 SELECT * FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t2; LEFT(a, 10) LENGTH(a) @@ -535,7 +535,7 @@ ALTER TABLE t1 ENGINE=InnoDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -653,7 +653,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # Make sure column was actually compressed INSERT INTO t1 VALUES(REPEAT('a', 1000)); @@ -689,7 +689,7 @@ ALTER TABLE t1 MODIFY COLUMN a VARCHAR(10000) COMPRESSED; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -706,7 +706,7 @@ CREATE TABLE t2 LIKE t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # Make sure implicit CREATE TABLE ... SELECT inherits compression @@ -714,7 +714,7 @@ CREATE TABLE t2 SELECT * FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t2; LEFT(a, 10) LENGTH(a) @@ -750,7 +750,7 @@ ALTER TABLE t1 ENGINE=InnoDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -868,7 +868,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # Make sure column was actually compressed INSERT INTO t1 VALUES(REPEAT('a', 1000)); @@ -904,7 +904,7 @@ ALTER TABLE t1 MODIFY COLUMN a TEXT COMPRESSED CHARSET ucs2; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -921,7 +921,7 @@ CREATE TABLE t2 LIKE t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # Make sure implicit CREATE TABLE ... SELECT inherits compression @@ -929,7 +929,7 @@ CREATE TABLE t2 SELECT * FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t2; LEFT(a, 10) LENGTH(a) @@ -965,7 +965,7 @@ ALTER TABLE t1 ENGINE=InnoDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -1084,7 +1084,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # Make sure column was actually compressed INSERT INTO t1 VALUES(REPEAT('a', 1000)); @@ -1120,7 +1120,7 @@ ALTER TABLE t1 MODIFY COLUMN a BLOB COMPRESSED; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -1137,7 +1137,7 @@ CREATE TABLE t2 LIKE t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; # Make sure implicit CREATE TABLE ... SELECT inherits compression @@ -1145,7 +1145,7 @@ CREATE TABLE t2 SELECT * FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t2; LEFT(a, 10) LENGTH(a) @@ -1181,7 +1181,7 @@ ALTER TABLE t1 ENGINE=InnoDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT LEFT(a, 10), LENGTH(a) FROM t1; LEFT(a, 10) LENGTH(a) @@ -1323,7 +1323,7 @@ LENGTH(a) SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ NOT NULL DEFAULT '' + `a` blob /*M!100301 COMPRESSED*/ NOT NULL DEFAULT '' ) ENGINE=CSV DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" DROP TABLE t1; @@ -1373,7 +1373,7 @@ CREATE TABLE t1(a VARCHAR(255) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(255) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(255) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET column_compression_threshold=300; INSERT INTO t1 VALUES(REPEAT('a', 255)); @@ -1483,12 +1483,12 @@ CREATE OR REPLACE TABLE t1 (a VARCHAR(1000) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `a` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'; COLUMN_TYPE -varchar(1000) /*!100301 COMPRESSED*/ +varchar(1000) /*M!100301 COMPRESSED*/ DROP TABLE t1; # # MDEV-17363 - Compressed columns cannot be restored from dump @@ -1507,10 +1507,10 @@ d TINYTEXT COMPRESSED BINARY SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`)), - `b` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `c` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `d` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`)), + `b` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, + `c` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `d` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1524,49 +1524,49 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1577,35 +1577,35 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(10) /*!100301 COMPRESSED*/ DEFAULT '' + `a` varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT '' + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1617,7 +1617,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) ASCII COMPRESSED); @@ -1626,7 +1626,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) BYTE COMPRESSED); @@ -1635,7 +1635,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1675,49 +1675,49 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1728,35 +1728,35 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ DEFAULT '' + `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1768,7 +1768,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT ASCII COMPRESSED); @@ -1777,7 +1777,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinytext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT BYTE COMPRESSED); @@ -1786,7 +1786,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1826,49 +1826,49 @@ CREATE TABLE t1 (a TEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1879,35 +1879,35 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT '' + `a` blob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT '' + `a` text /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1919,7 +1919,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT ASCII COMPRESSED); @@ -1928,7 +1928,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text /*!100301 COMPRESSED*/ DEFAULT NULL + `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TEXT BYTE COMPRESSED); @@ -1937,7 +1937,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -1977,49 +1977,49 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2030,35 +2030,35 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT '' + `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2070,7 +2070,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT ASCII COMPRESSED); @@ -2079,7 +2079,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT BYTE COMPRESSED); @@ -2088,7 +2088,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2128,49 +2128,49 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2181,35 +2181,35 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ DEFAULT '' + `a` longtext /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2221,7 +2221,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT ASCII COMPRESSED); @@ -2230,7 +2230,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longtext /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT BYTE COMPRESSED); @@ -2239,7 +2239,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2281,7 +2281,7 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2292,21 +2292,21 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT '' + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + `a` varchar(10) /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2318,7 +2318,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT '' + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) NULL COMPRESSED); @@ -2327,7 +2327,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2356,7 +2356,7 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2367,21 +2367,21 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYBLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + `a` tinyblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2393,7 +2393,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a TINYBLOB NULL COMPRESSED); @@ -2402,7 +2402,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2431,7 +2431,7 @@ CREATE TABLE t1 (a BLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2442,21 +2442,21 @@ CREATE TABLE t1 (a BLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT '' + `a` blob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a BLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a BLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + `a` blob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2468,7 +2468,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT '' + `a` blob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a BLOB NULL COMPRESSED); @@ -2477,7 +2477,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2506,7 +2506,7 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2517,21 +2517,21 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + `a` mediumblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2543,7 +2543,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a MEDIUMBLOB NULL COMPRESSED); @@ -2552,7 +2552,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2581,7 +2581,7 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2592,21 +2592,21 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGBLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + `a` longblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2618,7 +2618,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT '' + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a LONGBLOB NULL COMPRESSED); @@ -2627,7 +2627,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL + `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # @@ -2656,7 +2656,7 @@ CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED BINARY COMPRESSED); diff --git a/mysql-test/main/column_compression_parts.result b/mysql-test/main/column_compression_parts.result index 5f5539b723c..e960ff71927 100644 --- a/mysql-test/main/column_compression_parts.result +++ b/mysql-test/main/column_compression_parts.result @@ -64,7 +64,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL, - `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT 'AAA' + `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT 'AAA' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE COLUMNS(`a`) (PARTITION `p1` VALUES LESS THAN ('m') ENGINE = MyISAM, @@ -132,7 +132,7 @@ ALTER TABLE t1 MODIFY COLUMN a VARCHAR(1000) COMPRESSED; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT NULL, + `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT NULL, `id` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE COLUMNS(`id`,`a`) @@ -165,7 +165,7 @@ ALTER TABLE t1 PARTITION BY KEY(a) PARTITIONS 6; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT '10-12-2010' + `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT '10-12-2010' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY KEY (`a`) PARTITIONS 6 @@ -230,7 +230,7 @@ ALTER TABLE t2 REMOVE PARTITIONING; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(200) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(200) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY KEY (`a`) (PARTITION `p0` ENGINE = MyISAM, @@ -247,7 +247,7 @@ t1 CREATE TABLE `t1` ( SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(200) /*!100301 COMPRESSED*/ DEFAULT NULL + `a` varchar(200) /*M!100301 COMPRESSED*/ DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2; DROP TABLE t1,t2; @@ -265,7 +265,7 @@ ERROR HY000: Only RANGE PARTITIONING can use VALUES LESS THAN in partition defin SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` blob /*!100301 COMPRESSED*/ DEFAULT 5, + `a` blob /*M!100301 COMPRESSED*/ DEFAULT 5, `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY HASH (`i`) @@ -282,7 +282,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p2 INTO (PARTITION p22 VALUES LESS THAN (MAX SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(500) /*!100301 COMPRESSED*/ DEFAULT '5', + `a` varchar(500) /*M!100301 COMPRESSED*/ DEFAULT '5', `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY RANGE COLUMNS(`i`) diff --git a/mysql-test/main/mysqlbinlog_row_compressed.result b/mysql-test/main/mysqlbinlog_row_compressed.result index 820e100220f..39be61ba916 100644 --- a/mysql-test/main/mysqlbinlog_row_compressed.result +++ b/mysql-test/main/mysqlbinlog_row_compressed.result @@ -24,10 +24,10 @@ ROLLBACK/*!*/; # server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001 # at 329 # server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at 371 # server id 1 end_log_pos 533 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 use `test`/*!*/; @@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f /*!*/; # at 533 # server id 1 end_log_pos 575 CRC32 XXX GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at 575 # server id 1 end_log_pos 727 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 SET TIMESTAMP=X/*!*/; @@ -52,7 +52,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN /*!*/; # at 727 # server id 1 end_log_pos 769 CRC32 XXX GTID 0-1-3 -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at 769 @@ -81,7 +81,7 @@ COMMIT /*!*/; # at 1040 # server id 1 end_log_pos 1082 CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at 1082 @@ -110,7 +110,7 @@ COMMIT /*!*/; # at 1354 # server id 1 end_log_pos 1396 CRC32 XXX GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at 1396 @@ -139,7 +139,7 @@ COMMIT /*!*/; # at 1669 # server id 1 end_log_pos 1711 CRC32 XXX GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at 1711 @@ -168,7 +168,7 @@ COMMIT /*!*/; # at 1982 # server id 1 end_log_pos 2024 CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at 2024 @@ -230,7 +230,7 @@ COMMIT /*!*/; # at 2298 # server id 1 end_log_pos 2340 CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at 2340 @@ -311,7 +311,7 @@ COMMIT /*!*/; # at 2634 # server id 1 end_log_pos 2676 CRC32 XXX GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at 2676 @@ -373,7 +373,7 @@ COMMIT /*!*/; # at 2934 # server id 1 end_log_pos 2976 CRC32 XXX GTID 0-1-10 -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at 2976 diff --git a/mysql-test/main/mysqlbinlog_row_minimal.result b/mysql-test/main/mysqlbinlog_row_minimal.result index a44f07a66ea..31c8bff122e 100644 --- a/mysql-test/main/mysqlbinlog_row_minimal.result +++ b/mysql-test/main/mysqlbinlog_row_minimal.result @@ -22,10 +22,10 @@ ROLLBACK/*!*/; # server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001 # at 329 # server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at 371 # server id 1 end_log_pos 555 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 use `test`/*!*/; @@ -42,7 +42,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f /*!*/; # at 555 # server id 1 end_log_pos 597 CRC32 XXX GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at 597 # server id 1 end_log_pos 774 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 SET TIMESTAMP=X/*!*/; @@ -50,7 +50,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN /*!*/; # at 774 # server id 1 end_log_pos 816 CRC32 XXX GTID 0-1-3 -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at 816 @@ -79,7 +79,7 @@ COMMIT /*!*/; # at 1088 # server id 1 end_log_pos 1130 CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at 1130 @@ -108,7 +108,7 @@ COMMIT /*!*/; # at 1403 # server id 1 end_log_pos 1445 CRC32 XXX GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at 1445 @@ -137,7 +137,7 @@ COMMIT /*!*/; # at 1719 # server id 1 end_log_pos 1761 CRC32 XXX GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at 1761 @@ -166,7 +166,7 @@ COMMIT /*!*/; # at 2035 # server id 1 end_log_pos 2077 CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at 2077 @@ -228,7 +228,7 @@ COMMIT /*!*/; # at 2427 # server id 1 end_log_pos 2469 CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at 2469 @@ -261,7 +261,7 @@ COMMIT /*!*/; # at 2730 # server id 1 end_log_pos 2772 CRC32 XXX GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at 2772 @@ -291,7 +291,7 @@ COMMIT /*!*/; # at 2992 # server id 1 end_log_pos 3034 CRC32 XXX GTID 0-1-10 -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at 3034 @@ -371,10 +371,10 @@ FLUSH BINARY LOGS; DELIMITER /*!*/; # at POS # server id 1 end_log_pos END_LOG_POS CRC32 XXX GTID D-S-N -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=21*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=21*//*!*/; START TRANSACTION /*!*/; # at POS diff --git a/mysql-test/main/mysqlbinlog_stmt_compressed.result b/mysql-test/main/mysqlbinlog_stmt_compressed.result index 7db60a96b72..cb9f2c63ca1 100644 --- a/mysql-test/main/mysqlbinlog_stmt_compressed.result +++ b/mysql-test/main/mysqlbinlog_stmt_compressed.result @@ -24,10 +24,10 @@ ROLLBACK/*!*/; # server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001 # at 329 # server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at 371 # server id 1 end_log_pos 533 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 use `test`/*!*/; @@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f /*!*/; # at 533 # server id 1 end_log_pos 575 CRC32 XXX GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at 575 # server id 1 end_log_pos 727 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 SET TIMESTAMP=X/*!*/; @@ -52,7 +52,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN /*!*/; # at 727 # server id 1 end_log_pos 769 CRC32 XXX GTID 0-1-3 -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at 769 @@ -67,7 +67,7 @@ COMMIT /*!*/; # at 970 # server id 1 end_log_pos 1012 CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at 1012 @@ -82,7 +82,7 @@ COMMIT /*!*/; # at 1213 # server id 1 end_log_pos 1255 CRC32 XXX GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at 1255 @@ -97,7 +97,7 @@ COMMIT /*!*/; # at 1458 # server id 1 end_log_pos 1500 CRC32 XXX GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at 1500 @@ -112,7 +112,7 @@ COMMIT /*!*/; # at 1700 # server id 1 end_log_pos 1742 CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at 1742 @@ -127,7 +127,7 @@ COMMIT /*!*/; # at 1923 # server id 1 end_log_pos 1965 CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at 1965 @@ -142,7 +142,7 @@ COMMIT /*!*/; # at 2155 # server id 1 end_log_pos 2197 CRC32 XXX GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at 2197 @@ -157,7 +157,7 @@ COMMIT /*!*/; # at 2361 # server id 1 end_log_pos 2403 CRC32 XXX GTID 0-1-10 -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at 2403 diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result index 3287a19a3bf..c6a8417ac9f 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result @@ -367,10 +367,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -387,7 +387,7 @@ CREATE TABLE t1 (c01 BIT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -408,7 +408,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -429,7 +429,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 ddl -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -437,7 +437,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 ddl -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -445,7 +445,7 @@ CREATE TABLE t1 (c01 BIT(7)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -466,7 +466,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -487,7 +487,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -508,7 +508,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -529,7 +529,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10 -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at # @@ -550,7 +550,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11 -/*!100001 SET @@session.gtid_seq_no=11*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=11*//*!*/; START TRANSACTION /*!*/; # at # @@ -571,7 +571,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12 -/*!100001 SET @@session.gtid_seq_no=12*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=12*//*!*/; START TRANSACTION /*!*/; # at # @@ -592,7 +592,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-13 -/*!100001 SET @@session.gtid_seq_no=13*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=13*//*!*/; START TRANSACTION /*!*/; # at # @@ -613,7 +613,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-14 -/*!100001 SET @@session.gtid_seq_no=14*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=14*//*!*/; START TRANSACTION /*!*/; # at # @@ -634,7 +634,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-15 -/*!100001 SET @@session.gtid_seq_no=15*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=15*//*!*/; START TRANSACTION /*!*/; # at # @@ -657,7 +657,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-16 ddl -/*!100001 SET @@session.gtid_seq_no=16*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=16*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -665,7 +665,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-17 ddl -/*!100001 SET @@session.gtid_seq_no=17*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=17*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -673,7 +673,7 @@ CREATE TABLE t1 (a BIT(20), b CHAR(2)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-18 -/*!100001 SET @@session.gtid_seq_no=18*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=18*//*!*/; START TRANSACTION /*!*/; # at # @@ -695,7 +695,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-19 ddl -/*!100001 SET @@session.gtid_seq_no=19*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=19*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -703,7 +703,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-20 ddl -/*!100001 SET @@session.gtid_seq_no=20*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=20*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -711,7 +711,7 @@ CREATE TABLE t1 (c02 BIT(64)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-21 -/*!100001 SET @@session.gtid_seq_no=21*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=21*//*!*/; START TRANSACTION /*!*/; # at # @@ -732,7 +732,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-22 -/*!100001 SET @@session.gtid_seq_no=22*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=22*//*!*/; START TRANSACTION /*!*/; # at # @@ -753,7 +753,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-23 -/*!100001 SET @@session.gtid_seq_no=23*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=23*//*!*/; START TRANSACTION /*!*/; # at # @@ -774,7 +774,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-24 -/*!100001 SET @@session.gtid_seq_no=24*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=24*//*!*/; START TRANSACTION /*!*/; # at # @@ -795,7 +795,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-25 ddl -/*!100001 SET @@session.gtid_seq_no=25*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=25*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -803,7 +803,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-26 ddl -/*!100001 SET @@session.gtid_seq_no=26*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=26*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -811,7 +811,7 @@ CREATE TABLE t1 (c03 TINYINT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-27 -/*!100001 SET @@session.gtid_seq_no=27*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=27*//*!*/; START TRANSACTION /*!*/; # at # @@ -838,7 +838,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-28 -/*!100001 SET @@session.gtid_seq_no=28*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=28*//*!*/; START TRANSACTION /*!*/; # at # @@ -859,7 +859,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-29 -/*!100001 SET @@session.gtid_seq_no=29*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=29*//*!*/; START TRANSACTION /*!*/; # at # @@ -882,7 +882,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-30 -/*!100001 SET @@session.gtid_seq_no=30*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=30*//*!*/; START TRANSACTION /*!*/; # at # @@ -903,7 +903,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-31 ddl -/*!100001 SET @@session.gtid_seq_no=31*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=31*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -911,7 +911,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-32 ddl -/*!100001 SET @@session.gtid_seq_no=32*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=32*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -919,7 +919,7 @@ CREATE TABLE t1 (c04 TINYINT UNSIGNED) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-33 -/*!100001 SET @@session.gtid_seq_no=33*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=33*//*!*/; START TRANSACTION /*!*/; # at # @@ -943,7 +943,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-34 -/*!100001 SET @@session.gtid_seq_no=34*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=34*//*!*/; START TRANSACTION /*!*/; # at # @@ -964,7 +964,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-35 ddl -/*!100001 SET @@session.gtid_seq_no=35*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=35*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -972,7 +972,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-36 ddl -/*!100001 SET @@session.gtid_seq_no=36*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=36*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -980,7 +980,7 @@ CREATE TABLE t1 (c06 BOOL) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-37 -/*!100001 SET @@session.gtid_seq_no=37*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=37*//*!*/; START TRANSACTION /*!*/; # at # @@ -1001,7 +1001,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-38 -/*!100001 SET @@session.gtid_seq_no=38*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=38*//*!*/; START TRANSACTION /*!*/; # at # @@ -1022,7 +1022,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-39 ddl -/*!100001 SET @@session.gtid_seq_no=39*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=39*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1030,7 +1030,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-40 ddl -/*!100001 SET @@session.gtid_seq_no=40*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=40*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1038,7 +1038,7 @@ CREATE TABLE t1 (c07 SMALLINT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-41 -/*!100001 SET @@session.gtid_seq_no=41*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=41*//*!*/; START TRANSACTION /*!*/; # at # @@ -1059,7 +1059,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-42 -/*!100001 SET @@session.gtid_seq_no=42*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=42*//*!*/; START TRANSACTION /*!*/; # at # @@ -1080,7 +1080,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-43 ddl -/*!100001 SET @@session.gtid_seq_no=43*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=43*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1088,7 +1088,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-44 ddl -/*!100001 SET @@session.gtid_seq_no=44*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=44*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1096,7 +1096,7 @@ CREATE TABLE t1 (c08 SMALLINT UNSIGNED) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-45 -/*!100001 SET @@session.gtid_seq_no=45*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=45*//*!*/; START TRANSACTION /*!*/; # at # @@ -1120,7 +1120,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-46 -/*!100001 SET @@session.gtid_seq_no=46*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=46*//*!*/; START TRANSACTION /*!*/; # at # @@ -1143,7 +1143,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-47 -/*!100001 SET @@session.gtid_seq_no=47*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=47*//*!*/; START TRANSACTION /*!*/; # at # @@ -1164,7 +1164,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-48 ddl -/*!100001 SET @@session.gtid_seq_no=48*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=48*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1172,7 +1172,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-49 ddl -/*!100001 SET @@session.gtid_seq_no=49*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=49*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1180,7 +1180,7 @@ CREATE TABLE t1 (c10 MEDIUMINT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-50 -/*!100001 SET @@session.gtid_seq_no=50*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=50*//*!*/; START TRANSACTION /*!*/; # at # @@ -1201,7 +1201,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-51 -/*!100001 SET @@session.gtid_seq_no=51*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=51*//*!*/; START TRANSACTION /*!*/; # at # @@ -1222,7 +1222,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-52 ddl -/*!100001 SET @@session.gtid_seq_no=52*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=52*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1230,7 +1230,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-53 ddl -/*!100001 SET @@session.gtid_seq_no=53*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=53*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1238,7 +1238,7 @@ CREATE TABLE t1 (c11 MEDIUMINT UNSIGNED) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-54 -/*!100001 SET @@session.gtid_seq_no=54*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=54*//*!*/; START TRANSACTION /*!*/; # at # @@ -1262,7 +1262,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-55 -/*!100001 SET @@session.gtid_seq_no=55*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=55*//*!*/; START TRANSACTION /*!*/; # at # @@ -1285,7 +1285,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-56 -/*!100001 SET @@session.gtid_seq_no=56*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=56*//*!*/; START TRANSACTION /*!*/; # at # @@ -1306,7 +1306,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-57 ddl -/*!100001 SET @@session.gtid_seq_no=57*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=57*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1314,7 +1314,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-58 ddl -/*!100001 SET @@session.gtid_seq_no=58*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=58*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1322,7 +1322,7 @@ CREATE TABLE t1 (c13 INT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-59 -/*!100001 SET @@session.gtid_seq_no=59*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=59*//*!*/; START TRANSACTION /*!*/; # at # @@ -1343,7 +1343,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-60 -/*!100001 SET @@session.gtid_seq_no=60*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=60*//*!*/; START TRANSACTION /*!*/; # at # @@ -1364,7 +1364,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-61 ddl -/*!100001 SET @@session.gtid_seq_no=61*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=61*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1372,7 +1372,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-62 ddl -/*!100001 SET @@session.gtid_seq_no=62*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=62*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1380,7 +1380,7 @@ CREATE TABLE t1 (c14 INT UNSIGNED) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-63 -/*!100001 SET @@session.gtid_seq_no=63*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=63*//*!*/; START TRANSACTION /*!*/; # at # @@ -1404,7 +1404,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-64 -/*!100001 SET @@session.gtid_seq_no=64*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=64*//*!*/; START TRANSACTION /*!*/; # at # @@ -1427,7 +1427,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-65 -/*!100001 SET @@session.gtid_seq_no=65*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=65*//*!*/; START TRANSACTION /*!*/; # at # @@ -1448,7 +1448,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-66 ddl -/*!100001 SET @@session.gtid_seq_no=66*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=66*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1456,7 +1456,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-67 ddl -/*!100001 SET @@session.gtid_seq_no=67*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=67*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1464,7 +1464,7 @@ CREATE TABLE t1 (c16 BIGINT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-68 -/*!100001 SET @@session.gtid_seq_no=68*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=68*//*!*/; START TRANSACTION /*!*/; # at # @@ -1485,7 +1485,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-69 -/*!100001 SET @@session.gtid_seq_no=69*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=69*//*!*/; START TRANSACTION /*!*/; # at # @@ -1506,7 +1506,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-70 ddl -/*!100001 SET @@session.gtid_seq_no=70*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=70*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1514,7 +1514,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-71 ddl -/*!100001 SET @@session.gtid_seq_no=71*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=71*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1522,7 +1522,7 @@ CREATE TABLE t1 (c17 BIGINT UNSIGNED) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-72 -/*!100001 SET @@session.gtid_seq_no=72*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=72*//*!*/; START TRANSACTION /*!*/; # at # @@ -1546,7 +1546,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-73 -/*!100001 SET @@session.gtid_seq_no=73*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=73*//*!*/; START TRANSACTION /*!*/; # at # @@ -1569,7 +1569,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-74 -/*!100001 SET @@session.gtid_seq_no=74*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=74*//*!*/; START TRANSACTION /*!*/; # at # @@ -1590,7 +1590,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-75 ddl -/*!100001 SET @@session.gtid_seq_no=75*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=75*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1598,7 +1598,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-76 ddl -/*!100001 SET @@session.gtid_seq_no=76*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=76*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1606,7 +1606,7 @@ CREATE TABLE t1 (c19 FLOAT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-77 -/*!100001 SET @@session.gtid_seq_no=77*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=77*//*!*/; START TRANSACTION /*!*/; # at # @@ -1627,7 +1627,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-78 -/*!100001 SET @@session.gtid_seq_no=78*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=78*//*!*/; START TRANSACTION /*!*/; # at # @@ -1648,7 +1648,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-79 ddl -/*!100001 SET @@session.gtid_seq_no=79*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=79*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1656,7 +1656,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-80 ddl -/*!100001 SET @@session.gtid_seq_no=80*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=80*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1664,7 +1664,7 @@ CREATE TABLE t1 (c22 DOUBLE) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-81 -/*!100001 SET @@session.gtid_seq_no=81*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=81*//*!*/; START TRANSACTION /*!*/; # at # @@ -1685,7 +1685,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-82 -/*!100001 SET @@session.gtid_seq_no=82*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=82*//*!*/; START TRANSACTION /*!*/; # at # @@ -1706,7 +1706,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-83 ddl -/*!100001 SET @@session.gtid_seq_no=83*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=83*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1714,7 +1714,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-84 ddl -/*!100001 SET @@session.gtid_seq_no=84*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=84*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1722,7 +1722,7 @@ CREATE TABLE t1 (c25 DECIMAL(10,5)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-85 -/*!100001 SET @@session.gtid_seq_no=85*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=85*//*!*/; START TRANSACTION /*!*/; # at # @@ -1743,7 +1743,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-86 -/*!100001 SET @@session.gtid_seq_no=86*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=86*//*!*/; START TRANSACTION /*!*/; # at # @@ -1764,7 +1764,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-87 -/*!100001 SET @@session.gtid_seq_no=87*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=87*//*!*/; START TRANSACTION /*!*/; # at # @@ -1785,7 +1785,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-88 ddl -/*!100001 SET @@session.gtid_seq_no=88*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=88*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1793,7 +1793,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-89 ddl -/*!100001 SET @@session.gtid_seq_no=89*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=89*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1801,7 +1801,7 @@ CREATE TABLE t1 (c28 DATE) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-90 -/*!100001 SET @@session.gtid_seq_no=90*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=90*//*!*/; START TRANSACTION /*!*/; # at # @@ -1822,7 +1822,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-91 -/*!100001 SET @@session.gtid_seq_no=91*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=91*//*!*/; START TRANSACTION /*!*/; # at # @@ -1843,7 +1843,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-92 ddl -/*!100001 SET @@session.gtid_seq_no=92*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=92*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1851,7 +1851,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-93 ddl -/*!100001 SET @@session.gtid_seq_no=93*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=93*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1859,7 +1859,7 @@ CREATE TABLE t1 (c29 DATETIME) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-94 -/*!100001 SET @@session.gtid_seq_no=94*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=94*//*!*/; START TRANSACTION /*!*/; # at # @@ -1880,7 +1880,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-95 -/*!100001 SET @@session.gtid_seq_no=95*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=95*//*!*/; START TRANSACTION /*!*/; # at # @@ -1901,7 +1901,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-96 ddl -/*!100001 SET @@session.gtid_seq_no=96*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=96*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1909,7 +1909,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-97 ddl -/*!100001 SET @@session.gtid_seq_no=97*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=97*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1917,7 +1917,7 @@ CREATE TABLE t1 (c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURR /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-98 -/*!100001 SET @@session.gtid_seq_no=98*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=98*//*!*/; START TRANSACTION /*!*/; # at # @@ -1939,7 +1939,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-99 -/*!100001 SET @@session.gtid_seq_no=99*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=99*//*!*/; START TRANSACTION /*!*/; # at # @@ -1960,7 +1960,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-100 ddl -/*!100001 SET @@session.gtid_seq_no=100*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=100*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1968,7 +1968,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-101 ddl -/*!100001 SET @@session.gtid_seq_no=101*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=101*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1976,7 +1976,7 @@ CREATE TABLE t1 (c31 TIME) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-102 -/*!100001 SET @@session.gtid_seq_no=102*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=102*//*!*/; START TRANSACTION /*!*/; # at # @@ -1997,7 +1997,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-103 -/*!100001 SET @@session.gtid_seq_no=103*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=103*//*!*/; START TRANSACTION /*!*/; # at # @@ -2018,7 +2018,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-104 ddl -/*!100001 SET @@session.gtid_seq_no=104*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=104*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2026,7 +2026,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-105 ddl -/*!100001 SET @@session.gtid_seq_no=105*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=105*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2034,7 +2034,7 @@ CREATE TABLE t1 (c32 YEAR) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-106 -/*!100001 SET @@session.gtid_seq_no=106*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=106*//*!*/; START TRANSACTION /*!*/; # at # @@ -2055,7 +2055,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-107 -/*!100001 SET @@session.gtid_seq_no=107*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=107*//*!*/; START TRANSACTION /*!*/; # at # @@ -2076,7 +2076,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-108 ddl -/*!100001 SET @@session.gtid_seq_no=108*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=108*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2084,7 +2084,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-109 ddl -/*!100001 SET @@session.gtid_seq_no=109*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=109*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2092,7 +2092,7 @@ CREATE TABLE t1 (c33 CHAR) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-110 -/*!100001 SET @@session.gtid_seq_no=110*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=110*//*!*/; START TRANSACTION /*!*/; # at # @@ -2113,7 +2113,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-111 -/*!100001 SET @@session.gtid_seq_no=111*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=111*//*!*/; START TRANSACTION /*!*/; # at # @@ -2134,7 +2134,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-112 ddl -/*!100001 SET @@session.gtid_seq_no=112*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=112*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2142,7 +2142,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-113 ddl -/*!100001 SET @@session.gtid_seq_no=113*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=113*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2150,7 +2150,7 @@ CREATE TABLE t1 (c34 CHAR(0)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-114 -/*!100001 SET @@session.gtid_seq_no=114*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=114*//*!*/; START TRANSACTION /*!*/; # at # @@ -2171,7 +2171,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-115 -/*!100001 SET @@session.gtid_seq_no=115*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=115*//*!*/; START TRANSACTION /*!*/; # at # @@ -2192,7 +2192,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-116 ddl -/*!100001 SET @@session.gtid_seq_no=116*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=116*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2200,7 +2200,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-117 ddl -/*!100001 SET @@session.gtid_seq_no=117*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=117*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2208,7 +2208,7 @@ CREATE TABLE t1 (c35 CHAR(1)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-118 -/*!100001 SET @@session.gtid_seq_no=118*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=118*//*!*/; START TRANSACTION /*!*/; # at # @@ -2229,7 +2229,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-119 -/*!100001 SET @@session.gtid_seq_no=119*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=119*//*!*/; START TRANSACTION /*!*/; # at # @@ -2250,7 +2250,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-120 ddl -/*!100001 SET @@session.gtid_seq_no=120*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=120*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2258,7 +2258,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-121 ddl -/*!100001 SET @@session.gtid_seq_no=121*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=121*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2266,7 +2266,7 @@ CREATE TABLE t1 (c36 CHAR(255)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-122 -/*!100001 SET @@session.gtid_seq_no=122*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=122*//*!*/; START TRANSACTION /*!*/; # at # @@ -2287,7 +2287,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-123 -/*!100001 SET @@session.gtid_seq_no=123*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=123*//*!*/; START TRANSACTION /*!*/; # at # @@ -2308,7 +2308,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-124 ddl -/*!100001 SET @@session.gtid_seq_no=124*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=124*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2316,7 +2316,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-125 ddl -/*!100001 SET @@session.gtid_seq_no=125*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=125*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2324,7 +2324,7 @@ CREATE TABLE t1 (c37 NATIONAL CHAR) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-126 -/*!100001 SET @@session.gtid_seq_no=126*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=126*//*!*/; START TRANSACTION /*!*/; # at # @@ -2345,7 +2345,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-127 -/*!100001 SET @@session.gtid_seq_no=127*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=127*//*!*/; START TRANSACTION /*!*/; # at # @@ -2366,7 +2366,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-128 ddl -/*!100001 SET @@session.gtid_seq_no=128*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=128*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2374,7 +2374,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-129 ddl -/*!100001 SET @@session.gtid_seq_no=129*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=129*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2382,7 +2382,7 @@ CREATE TABLE t1 (c38 NATIONAL CHAR(0)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-130 -/*!100001 SET @@session.gtid_seq_no=130*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=130*//*!*/; START TRANSACTION /*!*/; # at # @@ -2403,7 +2403,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-131 -/*!100001 SET @@session.gtid_seq_no=131*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=131*//*!*/; START TRANSACTION /*!*/; # at # @@ -2424,7 +2424,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-132 ddl -/*!100001 SET @@session.gtid_seq_no=132*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=132*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2432,7 +2432,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-133 ddl -/*!100001 SET @@session.gtid_seq_no=133*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=133*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2440,7 +2440,7 @@ CREATE TABLE t1 (c39 NATIONAL CHAR(1)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-134 -/*!100001 SET @@session.gtid_seq_no=134*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=134*//*!*/; START TRANSACTION /*!*/; # at # @@ -2461,7 +2461,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-135 -/*!100001 SET @@session.gtid_seq_no=135*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=135*//*!*/; START TRANSACTION /*!*/; # at # @@ -2482,7 +2482,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-136 ddl -/*!100001 SET @@session.gtid_seq_no=136*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=136*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2490,7 +2490,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-137 ddl -/*!100001 SET @@session.gtid_seq_no=137*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=137*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2498,7 +2498,7 @@ CREATE TABLE t1 (c40 NATIONAL CHAR(255)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-138 -/*!100001 SET @@session.gtid_seq_no=138*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=138*//*!*/; START TRANSACTION /*!*/; # at # @@ -2519,7 +2519,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-139 -/*!100001 SET @@session.gtid_seq_no=139*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=139*//*!*/; START TRANSACTION /*!*/; # at # @@ -2540,7 +2540,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-140 -/*!100001 SET @@session.gtid_seq_no=140*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=140*//*!*/; START TRANSACTION /*!*/; # at # @@ -2564,7 +2564,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-141 ddl -/*!100001 SET @@session.gtid_seq_no=141*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=141*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2572,7 +2572,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-142 ddl -/*!100001 SET @@session.gtid_seq_no=142*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=142*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2580,7 +2580,7 @@ CREATE TABLE t1 (c41 CHAR CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-143 -/*!100001 SET @@session.gtid_seq_no=143*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=143*//*!*/; START TRANSACTION /*!*/; # at # @@ -2601,7 +2601,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-144 -/*!100001 SET @@session.gtid_seq_no=144*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=144*//*!*/; START TRANSACTION /*!*/; # at # @@ -2622,7 +2622,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-145 ddl -/*!100001 SET @@session.gtid_seq_no=145*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=145*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2630,7 +2630,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-146 ddl -/*!100001 SET @@session.gtid_seq_no=146*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=146*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2638,7 +2638,7 @@ CREATE TABLE t1 (c42 CHAR(0) CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-147 -/*!100001 SET @@session.gtid_seq_no=147*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=147*//*!*/; START TRANSACTION /*!*/; # at # @@ -2659,7 +2659,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-148 -/*!100001 SET @@session.gtid_seq_no=148*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=148*//*!*/; START TRANSACTION /*!*/; # at # @@ -2680,7 +2680,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-149 ddl -/*!100001 SET @@session.gtid_seq_no=149*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=149*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2688,7 +2688,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-150 ddl -/*!100001 SET @@session.gtid_seq_no=150*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=150*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2696,7 +2696,7 @@ CREATE TABLE t1 (c43 CHAR(1) CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-151 -/*!100001 SET @@session.gtid_seq_no=151*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=151*//*!*/; START TRANSACTION /*!*/; # at # @@ -2717,7 +2717,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-152 -/*!100001 SET @@session.gtid_seq_no=152*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=152*//*!*/; START TRANSACTION /*!*/; # at # @@ -2738,7 +2738,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-153 ddl -/*!100001 SET @@session.gtid_seq_no=153*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=153*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2746,7 +2746,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-154 ddl -/*!100001 SET @@session.gtid_seq_no=154*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=154*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2754,7 +2754,7 @@ CREATE TABLE t1 (c44 CHAR(255) CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-155 -/*!100001 SET @@session.gtid_seq_no=155*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=155*//*!*/; START TRANSACTION /*!*/; # at # @@ -2775,7 +2775,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-156 -/*!100001 SET @@session.gtid_seq_no=156*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=156*//*!*/; START TRANSACTION /*!*/; # at # @@ -2796,7 +2796,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-157 -/*!100001 SET @@session.gtid_seq_no=157*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=157*//*!*/; START TRANSACTION /*!*/; # at # @@ -2820,7 +2820,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-158 ddl -/*!100001 SET @@session.gtid_seq_no=158*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=158*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2828,7 +2828,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-159 ddl -/*!100001 SET @@session.gtid_seq_no=159*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=159*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2836,7 +2836,7 @@ CREATE TABLE t1 (c45 VARCHAR(0)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-160 -/*!100001 SET @@session.gtid_seq_no=160*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=160*//*!*/; START TRANSACTION /*!*/; # at # @@ -2857,7 +2857,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-161 -/*!100001 SET @@session.gtid_seq_no=161*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=161*//*!*/; START TRANSACTION /*!*/; # at # @@ -2878,7 +2878,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-162 ddl -/*!100001 SET @@session.gtid_seq_no=162*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=162*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2886,7 +2886,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-163 ddl -/*!100001 SET @@session.gtid_seq_no=163*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=163*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2894,7 +2894,7 @@ CREATE TABLE t1 (c46 VARCHAR(1)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-164 -/*!100001 SET @@session.gtid_seq_no=164*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=164*//*!*/; START TRANSACTION /*!*/; # at # @@ -2915,7 +2915,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-165 -/*!100001 SET @@session.gtid_seq_no=165*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=165*//*!*/; START TRANSACTION /*!*/; # at # @@ -2936,7 +2936,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-166 ddl -/*!100001 SET @@session.gtid_seq_no=166*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=166*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2944,7 +2944,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-167 ddl -/*!100001 SET @@session.gtid_seq_no=167*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=167*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -2952,7 +2952,7 @@ CREATE TABLE t1 (c47 VARCHAR(255)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-168 -/*!100001 SET @@session.gtid_seq_no=168*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=168*//*!*/; START TRANSACTION /*!*/; # at # @@ -2973,7 +2973,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-169 -/*!100001 SET @@session.gtid_seq_no=169*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=169*//*!*/; START TRANSACTION /*!*/; # at # @@ -2994,7 +2994,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-170 ddl -/*!100001 SET @@session.gtid_seq_no=170*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=170*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3002,7 +3002,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-171 ddl -/*!100001 SET @@session.gtid_seq_no=171*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=171*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3010,7 +3010,7 @@ CREATE TABLE t1 (c48 VARCHAR(261)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-172 -/*!100001 SET @@session.gtid_seq_no=172*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=172*//*!*/; START TRANSACTION /*!*/; # at # @@ -3031,7 +3031,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-173 -/*!100001 SET @@session.gtid_seq_no=173*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=173*//*!*/; START TRANSACTION /*!*/; # at # @@ -3052,7 +3052,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-174 ddl -/*!100001 SET @@session.gtid_seq_no=174*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=174*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3060,7 +3060,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-175 ddl -/*!100001 SET @@session.gtid_seq_no=175*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=175*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3068,7 +3068,7 @@ CREATE TABLE t1 (c49 NATIONAL VARCHAR(0)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-176 -/*!100001 SET @@session.gtid_seq_no=176*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=176*//*!*/; START TRANSACTION /*!*/; # at # @@ -3089,7 +3089,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-177 -/*!100001 SET @@session.gtid_seq_no=177*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=177*//*!*/; START TRANSACTION /*!*/; # at # @@ -3110,7 +3110,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-178 ddl -/*!100001 SET @@session.gtid_seq_no=178*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=178*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3118,7 +3118,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-179 ddl -/*!100001 SET @@session.gtid_seq_no=179*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=179*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3126,7 +3126,7 @@ CREATE TABLE t1 (c50 NATIONAL VARCHAR(1)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-180 -/*!100001 SET @@session.gtid_seq_no=180*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=180*//*!*/; START TRANSACTION /*!*/; # at # @@ -3147,7 +3147,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-181 -/*!100001 SET @@session.gtid_seq_no=181*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=181*//*!*/; START TRANSACTION /*!*/; # at # @@ -3168,7 +3168,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-182 ddl -/*!100001 SET @@session.gtid_seq_no=182*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=182*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3176,7 +3176,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-183 ddl -/*!100001 SET @@session.gtid_seq_no=183*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=183*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3184,7 +3184,7 @@ CREATE TABLE t1 (c51 NATIONAL VARCHAR(255)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-184 -/*!100001 SET @@session.gtid_seq_no=184*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=184*//*!*/; START TRANSACTION /*!*/; # at # @@ -3205,7 +3205,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-185 -/*!100001 SET @@session.gtid_seq_no=185*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=185*//*!*/; START TRANSACTION /*!*/; # at # @@ -3226,7 +3226,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-186 -/*!100001 SET @@session.gtid_seq_no=186*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=186*//*!*/; START TRANSACTION /*!*/; # at # @@ -3250,7 +3250,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-187 ddl -/*!100001 SET @@session.gtid_seq_no=187*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=187*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3258,7 +3258,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-188 ddl -/*!100001 SET @@session.gtid_seq_no=188*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=188*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3266,7 +3266,7 @@ CREATE TABLE t1 (c52 NATIONAL VARCHAR(261)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-189 -/*!100001 SET @@session.gtid_seq_no=189*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=189*//*!*/; START TRANSACTION /*!*/; # at # @@ -3287,7 +3287,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-190 -/*!100001 SET @@session.gtid_seq_no=190*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=190*//*!*/; START TRANSACTION /*!*/; # at # @@ -3308,7 +3308,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-191 -/*!100001 SET @@session.gtid_seq_no=191*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=191*//*!*/; START TRANSACTION /*!*/; # at # @@ -3332,7 +3332,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-192 ddl -/*!100001 SET @@session.gtid_seq_no=192*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=192*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3340,7 +3340,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-193 ddl -/*!100001 SET @@session.gtid_seq_no=193*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=193*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3348,7 +3348,7 @@ CREATE TABLE t1 (c53 VARCHAR(0) CHARACTER SET ucs2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-194 -/*!100001 SET @@session.gtid_seq_no=194*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=194*//*!*/; START TRANSACTION /*!*/; # at # @@ -3369,7 +3369,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-195 -/*!100001 SET @@session.gtid_seq_no=195*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=195*//*!*/; START TRANSACTION /*!*/; # at # @@ -3390,7 +3390,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-196 ddl -/*!100001 SET @@session.gtid_seq_no=196*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=196*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3398,7 +3398,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-197 ddl -/*!100001 SET @@session.gtid_seq_no=197*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=197*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3406,7 +3406,7 @@ CREATE TABLE t1 (c54 VARCHAR(1) CHARACTER SET ucs2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-198 -/*!100001 SET @@session.gtid_seq_no=198*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=198*//*!*/; START TRANSACTION /*!*/; # at # @@ -3427,7 +3427,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-199 -/*!100001 SET @@session.gtid_seq_no=199*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=199*//*!*/; START TRANSACTION /*!*/; # at # @@ -3448,7 +3448,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-200 ddl -/*!100001 SET @@session.gtid_seq_no=200*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=200*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3456,7 +3456,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-201 ddl -/*!100001 SET @@session.gtid_seq_no=201*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=201*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3464,7 +3464,7 @@ CREATE TABLE t1 (c55 VARCHAR(255) CHARACTER SET ucs2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-202 -/*!100001 SET @@session.gtid_seq_no=202*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=202*//*!*/; START TRANSACTION /*!*/; # at # @@ -3485,7 +3485,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-203 -/*!100001 SET @@session.gtid_seq_no=203*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=203*//*!*/; START TRANSACTION /*!*/; # at # @@ -3506,7 +3506,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-204 ddl -/*!100001 SET @@session.gtid_seq_no=204*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=204*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3514,7 +3514,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-205 ddl -/*!100001 SET @@session.gtid_seq_no=205*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=205*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3522,7 +3522,7 @@ CREATE TABLE t1 (c56 VARCHAR(261) CHARACTER SET ucs2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-206 -/*!100001 SET @@session.gtid_seq_no=206*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=206*//*!*/; START TRANSACTION /*!*/; # at # @@ -3543,7 +3543,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-207 -/*!100001 SET @@session.gtid_seq_no=207*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=207*//*!*/; START TRANSACTION /*!*/; # at # @@ -3564,7 +3564,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-208 ddl -/*!100001 SET @@session.gtid_seq_no=208*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=208*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3572,7 +3572,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-209 ddl -/*!100001 SET @@session.gtid_seq_no=209*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=209*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3580,7 +3580,7 @@ CREATE TABLE t1 (c57 BINARY) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-210 -/*!100001 SET @@session.gtid_seq_no=210*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=210*//*!*/; START TRANSACTION /*!*/; # at # @@ -3601,7 +3601,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-211 -/*!100001 SET @@session.gtid_seq_no=211*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=211*//*!*/; START TRANSACTION /*!*/; # at # @@ -3622,7 +3622,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-212 -/*!100001 SET @@session.gtid_seq_no=212*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=212*//*!*/; START TRANSACTION /*!*/; # at # @@ -3643,7 +3643,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-213 -/*!100001 SET @@session.gtid_seq_no=213*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=213*//*!*/; START TRANSACTION /*!*/; # at # @@ -3664,7 +3664,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-214 ddl -/*!100001 SET @@session.gtid_seq_no=214*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=214*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3672,7 +3672,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-215 ddl -/*!100001 SET @@session.gtid_seq_no=215*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=215*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3680,7 +3680,7 @@ CREATE TABLE t1 (c58 BINARY(0)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-216 -/*!100001 SET @@session.gtid_seq_no=216*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=216*//*!*/; START TRANSACTION /*!*/; # at # @@ -3701,7 +3701,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-217 -/*!100001 SET @@session.gtid_seq_no=217*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=217*//*!*/; START TRANSACTION /*!*/; # at # @@ -3722,7 +3722,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-218 ddl -/*!100001 SET @@session.gtid_seq_no=218*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=218*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3730,7 +3730,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-219 ddl -/*!100001 SET @@session.gtid_seq_no=219*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=219*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3738,7 +3738,7 @@ CREATE TABLE t1 (c59 BINARY(1)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-220 -/*!100001 SET @@session.gtid_seq_no=220*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=220*//*!*/; START TRANSACTION /*!*/; # at # @@ -3759,7 +3759,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-221 -/*!100001 SET @@session.gtid_seq_no=221*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=221*//*!*/; START TRANSACTION /*!*/; # at # @@ -3780,7 +3780,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-222 -/*!100001 SET @@session.gtid_seq_no=222*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=222*//*!*/; START TRANSACTION /*!*/; # at # @@ -3801,7 +3801,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-223 -/*!100001 SET @@session.gtid_seq_no=223*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=223*//*!*/; START TRANSACTION /*!*/; # at # @@ -3822,7 +3822,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-224 ddl -/*!100001 SET @@session.gtid_seq_no=224*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=224*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3830,7 +3830,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-225 ddl -/*!100001 SET @@session.gtid_seq_no=225*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=225*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3838,7 +3838,7 @@ CREATE TABLE t1 (c60 BINARY(255)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-226 -/*!100001 SET @@session.gtid_seq_no=226*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=226*//*!*/; START TRANSACTION /*!*/; # at # @@ -3859,7 +3859,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-227 -/*!100001 SET @@session.gtid_seq_no=227*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=227*//*!*/; START TRANSACTION /*!*/; # at # @@ -3880,7 +3880,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-228 -/*!100001 SET @@session.gtid_seq_no=228*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=228*//*!*/; START TRANSACTION /*!*/; # at # @@ -3901,7 +3901,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-229 -/*!100001 SET @@session.gtid_seq_no=229*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=229*//*!*/; START TRANSACTION /*!*/; # at # @@ -3922,7 +3922,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-230 ddl -/*!100001 SET @@session.gtid_seq_no=230*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=230*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3930,7 +3930,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-231 ddl -/*!100001 SET @@session.gtid_seq_no=231*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=231*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3938,7 +3938,7 @@ CREATE TABLE t1 (c61 VARBINARY(0)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-232 -/*!100001 SET @@session.gtid_seq_no=232*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=232*//*!*/; START TRANSACTION /*!*/; # at # @@ -3959,7 +3959,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-233 -/*!100001 SET @@session.gtid_seq_no=233*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=233*//*!*/; START TRANSACTION /*!*/; # at # @@ -3980,7 +3980,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-234 ddl -/*!100001 SET @@session.gtid_seq_no=234*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=234*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3988,7 +3988,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-235 ddl -/*!100001 SET @@session.gtid_seq_no=235*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=235*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -3996,7 +3996,7 @@ CREATE TABLE t1 (c62 VARBINARY(1)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-236 -/*!100001 SET @@session.gtid_seq_no=236*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=236*//*!*/; START TRANSACTION /*!*/; # at # @@ -4017,7 +4017,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-237 -/*!100001 SET @@session.gtid_seq_no=237*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=237*//*!*/; START TRANSACTION /*!*/; # at # @@ -4038,7 +4038,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-238 -/*!100001 SET @@session.gtid_seq_no=238*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=238*//*!*/; START TRANSACTION /*!*/; # at # @@ -4059,7 +4059,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-239 -/*!100001 SET @@session.gtid_seq_no=239*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=239*//*!*/; START TRANSACTION /*!*/; # at # @@ -4080,7 +4080,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-240 ddl -/*!100001 SET @@session.gtid_seq_no=240*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=240*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4088,7 +4088,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-241 ddl -/*!100001 SET @@session.gtid_seq_no=241*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=241*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4096,7 +4096,7 @@ CREATE TABLE t1 (c63 VARBINARY(255)) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-242 -/*!100001 SET @@session.gtid_seq_no=242*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=242*//*!*/; START TRANSACTION /*!*/; # at # @@ -4117,7 +4117,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-243 -/*!100001 SET @@session.gtid_seq_no=243*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=243*//*!*/; START TRANSACTION /*!*/; # at # @@ -4138,7 +4138,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-244 -/*!100001 SET @@session.gtid_seq_no=244*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=244*//*!*/; START TRANSACTION /*!*/; # at # @@ -4159,7 +4159,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-245 -/*!100001 SET @@session.gtid_seq_no=245*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=245*//*!*/; START TRANSACTION /*!*/; # at # @@ -4180,7 +4180,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-246 ddl -/*!100001 SET @@session.gtid_seq_no=246*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=246*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4188,7 +4188,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-247 ddl -/*!100001 SET @@session.gtid_seq_no=247*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=247*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4196,7 +4196,7 @@ CREATE TABLE t1 (c65 TINYBLOB) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-248 -/*!100001 SET @@session.gtid_seq_no=248*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=248*//*!*/; START TRANSACTION /*!*/; # at # @@ -4217,7 +4217,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-249 -/*!100001 SET @@session.gtid_seq_no=249*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=249*//*!*/; START TRANSACTION /*!*/; # at # @@ -4238,7 +4238,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-250 ddl -/*!100001 SET @@session.gtid_seq_no=250*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=250*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4246,7 +4246,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-251 ddl -/*!100001 SET @@session.gtid_seq_no=251*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=251*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4254,7 +4254,7 @@ CREATE TABLE t1 (c68 BLOB) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-252 -/*!100001 SET @@session.gtid_seq_no=252*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=252*//*!*/; START TRANSACTION /*!*/; # at # @@ -4275,7 +4275,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-253 -/*!100001 SET @@session.gtid_seq_no=253*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=253*//*!*/; START TRANSACTION /*!*/; # at # @@ -4296,7 +4296,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-254 ddl -/*!100001 SET @@session.gtid_seq_no=254*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=254*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4304,7 +4304,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-255 ddl -/*!100001 SET @@session.gtid_seq_no=255*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=255*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4312,7 +4312,7 @@ CREATE TABLE t1 (c71 MEDIUMBLOB) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-256 -/*!100001 SET @@session.gtid_seq_no=256*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=256*//*!*/; START TRANSACTION /*!*/; # at # @@ -4333,7 +4333,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-257 -/*!100001 SET @@session.gtid_seq_no=257*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=257*//*!*/; START TRANSACTION /*!*/; # at # @@ -4354,7 +4354,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-258 ddl -/*!100001 SET @@session.gtid_seq_no=258*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=258*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4362,7 +4362,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-259 ddl -/*!100001 SET @@session.gtid_seq_no=259*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=259*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4370,7 +4370,7 @@ CREATE TABLE t1 (c74 LONGBLOB) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-260 -/*!100001 SET @@session.gtid_seq_no=260*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=260*//*!*/; START TRANSACTION /*!*/; # at # @@ -4391,7 +4391,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-261 -/*!100001 SET @@session.gtid_seq_no=261*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=261*//*!*/; START TRANSACTION /*!*/; # at # @@ -4412,7 +4412,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-262 ddl -/*!100001 SET @@session.gtid_seq_no=262*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=262*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4420,7 +4420,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-263 ddl -/*!100001 SET @@session.gtid_seq_no=263*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=263*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4428,7 +4428,7 @@ CREATE TABLE t1 (c66 TINYTEXT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-264 -/*!100001 SET @@session.gtid_seq_no=264*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=264*//*!*/; START TRANSACTION /*!*/; # at # @@ -4449,7 +4449,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-265 -/*!100001 SET @@session.gtid_seq_no=265*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=265*//*!*/; START TRANSACTION /*!*/; # at # @@ -4470,7 +4470,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-266 ddl -/*!100001 SET @@session.gtid_seq_no=266*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=266*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4478,7 +4478,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-267 ddl -/*!100001 SET @@session.gtid_seq_no=267*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=267*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4486,7 +4486,7 @@ CREATE TABLE t1 (c69 TEXT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-268 -/*!100001 SET @@session.gtid_seq_no=268*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=268*//*!*/; START TRANSACTION /*!*/; # at # @@ -4507,7 +4507,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-269 -/*!100001 SET @@session.gtid_seq_no=269*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=269*//*!*/; START TRANSACTION /*!*/; # at # @@ -4528,7 +4528,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-270 ddl -/*!100001 SET @@session.gtid_seq_no=270*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=270*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4536,7 +4536,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-271 ddl -/*!100001 SET @@session.gtid_seq_no=271*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=271*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4544,7 +4544,7 @@ CREATE TABLE t1 (c72 MEDIUMTEXT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-272 -/*!100001 SET @@session.gtid_seq_no=272*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=272*//*!*/; START TRANSACTION /*!*/; # at # @@ -4565,7 +4565,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-273 -/*!100001 SET @@session.gtid_seq_no=273*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=273*//*!*/; START TRANSACTION /*!*/; # at # @@ -4586,7 +4586,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-274 ddl -/*!100001 SET @@session.gtid_seq_no=274*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=274*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4594,7 +4594,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-275 ddl -/*!100001 SET @@session.gtid_seq_no=275*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=275*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4602,7 +4602,7 @@ CREATE TABLE t1 (c75 LONGTEXT) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-276 -/*!100001 SET @@session.gtid_seq_no=276*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=276*//*!*/; START TRANSACTION /*!*/; # at # @@ -4623,7 +4623,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-277 -/*!100001 SET @@session.gtid_seq_no=277*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=277*//*!*/; START TRANSACTION /*!*/; # at # @@ -4644,7 +4644,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-278 ddl -/*!100001 SET @@session.gtid_seq_no=278*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=278*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4652,7 +4652,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-279 ddl -/*!100001 SET @@session.gtid_seq_no=279*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=279*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4660,7 +4660,7 @@ CREATE TABLE t1 (c67 TINYTEXT CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-280 -/*!100001 SET @@session.gtid_seq_no=280*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=280*//*!*/; START TRANSACTION /*!*/; # at # @@ -4681,7 +4681,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-281 -/*!100001 SET @@session.gtid_seq_no=281*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=281*//*!*/; START TRANSACTION /*!*/; # at # @@ -4702,7 +4702,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-282 ddl -/*!100001 SET @@session.gtid_seq_no=282*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=282*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4710,7 +4710,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-283 ddl -/*!100001 SET @@session.gtid_seq_no=283*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=283*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4718,7 +4718,7 @@ CREATE TABLE t1 (c70 TEXT CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-284 -/*!100001 SET @@session.gtid_seq_no=284*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=284*//*!*/; START TRANSACTION /*!*/; # at # @@ -4739,7 +4739,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-285 -/*!100001 SET @@session.gtid_seq_no=285*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=285*//*!*/; START TRANSACTION /*!*/; # at # @@ -4760,7 +4760,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-286 ddl -/*!100001 SET @@session.gtid_seq_no=286*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=286*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4768,7 +4768,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-287 ddl -/*!100001 SET @@session.gtid_seq_no=287*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=287*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4776,7 +4776,7 @@ CREATE TABLE t1 (c73 MEDIUMTEXT CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-288 -/*!100001 SET @@session.gtid_seq_no=288*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=288*//*!*/; START TRANSACTION /*!*/; # at # @@ -4797,7 +4797,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-289 -/*!100001 SET @@session.gtid_seq_no=289*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=289*//*!*/; START TRANSACTION /*!*/; # at # @@ -4818,7 +4818,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-290 ddl -/*!100001 SET @@session.gtid_seq_no=290*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=290*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4826,7 +4826,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-291 ddl -/*!100001 SET @@session.gtid_seq_no=291*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=291*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4834,7 +4834,7 @@ CREATE TABLE t1 (c76 LONGTEXT CHARACTER SET UCS2) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-292 -/*!100001 SET @@session.gtid_seq_no=292*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=292*//*!*/; START TRANSACTION /*!*/; # at # @@ -4855,7 +4855,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-293 -/*!100001 SET @@session.gtid_seq_no=293*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=293*//*!*/; START TRANSACTION /*!*/; # at # @@ -4876,7 +4876,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-294 ddl -/*!100001 SET @@session.gtid_seq_no=294*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=294*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4884,7 +4884,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-295 ddl -/*!100001 SET @@session.gtid_seq_no=295*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=295*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4892,7 +4892,7 @@ CREATE TABLE t1 (c77 ENUM('a','b','c')) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-296 -/*!100001 SET @@session.gtid_seq_no=296*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=296*//*!*/; START TRANSACTION /*!*/; # at # @@ -4913,7 +4913,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-297 -/*!100001 SET @@session.gtid_seq_no=297*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=297*//*!*/; START TRANSACTION /*!*/; # at # @@ -4934,7 +4934,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-298 ddl -/*!100001 SET @@session.gtid_seq_no=298*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=298*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4942,7 +4942,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-299 ddl -/*!100001 SET @@session.gtid_seq_no=299*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=299*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -4950,7 +4950,7 @@ CREATE TABLE t1 (c78 SET('a','b','c','d','e','f')) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-300 -/*!100001 SET @@session.gtid_seq_no=300*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=300*//*!*/; START TRANSACTION /*!*/; # at # @@ -4971,7 +4971,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-301 -/*!100001 SET @@session.gtid_seq_no=301*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=301*//*!*/; START TRANSACTION /*!*/; # at # @@ -4992,7 +4992,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-302 -/*!100001 SET @@session.gtid_seq_no=302*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=302*//*!*/; START TRANSACTION /*!*/; # at # @@ -5013,7 +5013,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-303 -/*!100001 SET @@session.gtid_seq_no=303*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=303*//*!*/; START TRANSACTION /*!*/; # at # @@ -5034,7 +5034,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-304 -/*!100001 SET @@session.gtid_seq_no=304*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=304*//*!*/; START TRANSACTION /*!*/; # at # @@ -5055,7 +5055,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-305 -/*!100001 SET @@session.gtid_seq_no=305*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=305*//*!*/; START TRANSACTION /*!*/; # at # @@ -5076,7 +5076,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-306 -/*!100001 SET @@session.gtid_seq_no=306*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=306*//*!*/; START TRANSACTION /*!*/; # at # @@ -5097,7 +5097,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-307 -/*!100001 SET @@session.gtid_seq_no=307*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=307*//*!*/; START TRANSACTION /*!*/; # at # @@ -5118,7 +5118,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-308 ddl -/*!100001 SET @@session.gtid_seq_no=308*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=308*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5126,7 +5126,7 @@ DROP TABLE `t1` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-309 ddl -/*!100001 SET @@session.gtid_seq_no=309*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=309*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5134,7 +5134,7 @@ CREATE TABLE t1 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-310 ddl -/*!100001 SET @@session.gtid_seq_no=310*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=310*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5142,7 +5142,7 @@ CREATE TABLE t2 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-311 -/*!100001 SET @@session.gtid_seq_no=311*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=311*//*!*/; START TRANSACTION /*!*/; # at # @@ -5164,7 +5164,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-312 -/*!100001 SET @@session.gtid_seq_no=312*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=312*//*!*/; START TRANSACTION /*!*/; # at # @@ -5186,7 +5186,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-313 -/*!100001 SET @@session.gtid_seq_no=313*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=313*//*!*/; START TRANSACTION /*!*/; # at # @@ -5208,7 +5208,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-314 -/*!100001 SET @@session.gtid_seq_no=314*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=314*//*!*/; START TRANSACTION /*!*/; # at # @@ -5230,7 +5230,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-315 -/*!100001 SET @@session.gtid_seq_no=315*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=315*//*!*/; START TRANSACTION /*!*/; # at # @@ -5280,7 +5280,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-316 ddl -/*!100001 SET @@session.gtid_seq_no=316*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=316*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5288,7 +5288,7 @@ DROP TABLE `t1`,`t2` /* generated by server */ /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-317 ddl -/*!100001 SET @@session.gtid_seq_no=317*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=317*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5298,7 +5298,7 @@ c_text_utf8 blob ) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-318 -/*!100001 SET @@session.gtid_seq_no=318*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=318*//*!*/; START TRANSACTION /*!*/; # at # @@ -5321,7 +5321,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-319 ddl -/*!100001 SET @@session.gtid_seq_no=319*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=319*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5348,10 +5348,10 @@ DELIMITER /*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000002 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-320 -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=320*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=320*//*!*/; START TRANSACTION /*!*/; # at # @@ -5377,10 +5377,10 @@ DELIMITER /*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-324 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=324*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=324*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -5397,7 +5397,7 @@ CREATE TABLE t1 (a GEOMETRY DEFAULT NULL) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-325 -/*!100001 SET @@session.gtid_seq_no=325*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=325*//*!*/; START TRANSACTION /*!*/; # at # @@ -5418,7 +5418,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-326 -/*!100001 SET @@session.gtid_seq_no=326*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=326*//*!*/; START TRANSACTION /*!*/; # at # @@ -5439,7 +5439,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-327 ddl -/*!100001 SET @@session.gtid_seq_no=327*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=327*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result index bb2cfc02e56..f6c24e66f1e 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -2259,10 +2259,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -2367,7 +2367,7 @@ crn INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -2552,7 +2552,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -2737,7 +2737,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -3091,7 +3091,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 trans -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -3445,7 +3445,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 trans -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -3800,7 +3800,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 trans -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -4154,7 +4154,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 trans -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -4509,7 +4509,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9 trans -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -4695,7 +4695,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10 trans -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at # @@ -4880,7 +4880,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11 trans -/*!100001 SET @@session.gtid_seq_no=11*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=11*//*!*/; START TRANSACTION /*!*/; # at # @@ -5066,7 +5066,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12 trans -/*!100001 SET @@session.gtid_seq_no=12*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=12*//*!*/; START TRANSACTION /*!*/; # at # @@ -5351,10 +5351,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -5375,7 +5375,7 @@ crn INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -5445,7 +5445,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -5524,7 +5524,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -5751,10 +5751,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -5775,7 +5775,7 @@ c_1_n INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5787,7 +5787,7 @@ c_2_n INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5799,7 +5799,7 @@ c_3_n INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -5869,7 +5869,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 trans -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -5939,7 +5939,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 trans -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -6009,7 +6009,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 trans -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -6199,7 +6199,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 trans -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -6389,10 +6389,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -6413,7 +6413,7 @@ c3 VARCHAR(60) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result index 5b0f40ea087..2b118372ada 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result @@ -2259,10 +2259,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -2367,7 +2367,7 @@ crn INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -2555,7 +2555,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -2742,7 +2742,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -3098,7 +3098,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -3454,7 +3454,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -3811,7 +3811,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -4167,7 +4167,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -4524,7 +4524,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -4712,7 +4712,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10 -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at # @@ -4899,7 +4899,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11 -/*!100001 SET @@session.gtid_seq_no=11*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=11*//*!*/; START TRANSACTION /*!*/; # at # @@ -5087,7 +5087,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12 -/*!100001 SET @@session.gtid_seq_no=12*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=12*//*!*/; START TRANSACTION /*!*/; # at # @@ -5374,10 +5374,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -5398,7 +5398,7 @@ crn INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -5470,7 +5470,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -5551,7 +5551,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -5780,10 +5780,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -5804,7 +5804,7 @@ c_1_n INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5816,7 +5816,7 @@ c_2_n INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -5828,7 +5828,7 @@ c_3_n INT -- row number /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -5900,7 +5900,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -5972,7 +5972,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -6044,7 +6044,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -6236,7 +6236,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -6428,10 +6428,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -6452,7 +6452,7 @@ c3 VARCHAR(60) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result index 8d67b348420..1a26879e565 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result @@ -137,10 +137,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -160,7 +160,7 @@ c2 VARCHAR(20) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -171,7 +171,7 @@ c2 VARCHAR(20) /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -240,7 +240,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 ddl -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -248,7 +248,7 @@ TRUNCATE TABLE t1 /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 ddl -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -256,7 +256,7 @@ TRUNCATE TABLE t1 /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -286,7 +286,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -325,7 +325,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -347,7 +347,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9 trans -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -416,7 +416,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10 ddl -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -424,7 +424,7 @@ TRUNCATE TABLE t1 /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11 ddl -/*!100001 SET @@session.gtid_seq_no=11*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=11*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -432,7 +432,7 @@ TRUNCATE TABLE t2 /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12 -/*!100001 SET @@session.gtid_seq_no=12*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=12*//*!*/; START TRANSACTION /*!*/; # at # @@ -462,7 +462,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-13 -/*!100001 SET @@session.gtid_seq_no=13*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=13*//*!*/; START TRANSACTION /*!*/; # at # @@ -501,7 +501,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-14 -/*!100001 SET @@session.gtid_seq_no=14*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=14*//*!*/; START TRANSACTION /*!*/; # at # @@ -523,7 +523,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-15 ddl -/*!100001 SET @@session.gtid_seq_no=15*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=15*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -531,7 +531,7 @@ TRUNCATE TABLE t1 /*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-16 ddl -/*!100001 SET @@session.gtid_seq_no=16*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=16*//*!*/; # at # #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result index 6a15fd47d55..fd9f87e7ea2 100644 --- a/mysql-test/suite/binlog/r/binlog_row_annotate.result +++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result @@ -108,10 +108,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -127,7 +127,7 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -135,7 +135,7 @@ CREATE DATABASE test2 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -143,7 +143,7 @@ CREATE DATABASE test3 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -170,7 +170,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -197,7 +197,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -224,7 +224,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -266,7 +266,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -293,7 +293,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -346,10 +346,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -365,15 +365,15 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -400,7 +400,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -413,7 +413,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -426,7 +426,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -456,7 +456,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -469,7 +469,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -505,10 +505,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -524,7 +524,7 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -532,7 +532,7 @@ CREATE DATABASE test2 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -540,7 +540,7 @@ CREATE DATABASE test3 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -565,7 +565,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -590,7 +590,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -615,7 +615,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -653,7 +653,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -678,7 +678,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -731,10 +731,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -750,7 +750,7 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -758,7 +758,7 @@ CREATE DATABASE test2 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -766,7 +766,7 @@ CREATE DATABASE test3 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -793,7 +793,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -820,7 +820,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -847,7 +847,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -889,7 +889,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -916,7 +916,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -969,10 +969,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -988,15 +988,15 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -1023,7 +1023,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -1036,7 +1036,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -1049,7 +1049,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -1079,7 +1079,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -1092,7 +1092,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -1128,10 +1128,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1147,7 +1147,7 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1155,7 +1155,7 @@ CREATE DATABASE test2 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -1163,7 +1163,7 @@ CREATE DATABASE test3 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -1187,7 +1187,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -1211,7 +1211,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -1235,7 +1235,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -1272,7 +1272,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -1296,7 +1296,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result index c9ee047afbf..4f1465348e5 100644 --- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result @@ -83,10 +83,10 @@ DELIMITER /*!*/; #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003 # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=#*//*!*/; -/*!100001 SET @@session.server_id=#*//*!*/; -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=#*//*!*/; +/*M!100001 SET @@session.server_id=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -103,7 +103,7 @@ CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8) /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -124,7 +124,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -145,7 +145,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -166,7 +166,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -187,7 +187,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -208,7 +208,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -229,7 +229,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=XXX/*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result index 2452c47573e..2ab9391d1bf 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result +++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result @@ -41,10 +41,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # use `new_test1`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 @@ -61,7 +61,7 @@ CREATE TABLE t1 (a INT, b INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-2 -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -87,7 +87,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test2`/*!*/; @@ -96,7 +96,7 @@ CREATE TABLE t2 (a INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -120,7 +120,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -142,7 +142,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-6 ddl -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # use `new_test3`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 @@ -151,7 +151,7 @@ CREATE TABLE t3 (a INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -175,7 +175,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -197,7 +197,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -236,7 +236,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-10 -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at # @@ -282,10 +282,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # use `new_test1`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 @@ -302,7 +302,7 @@ CREATE TABLE t1 (a INT, b INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-2 -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -328,7 +328,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test2`/*!*/; @@ -337,7 +337,7 @@ CREATE TABLE t2 (a INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -361,7 +361,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -383,7 +383,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-6 ddl -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; # at # use `new_test3`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 @@ -392,7 +392,7 @@ CREATE TABLE t3 (a INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -416,7 +416,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -438,7 +438,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -477,7 +477,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-10 -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at # diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result index a6f5cee1e25..099c3fb533e 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result @@ -85,10 +85,10 @@ DELIMITER /*!*/; #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003 # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=#*//*!*/; -/*!100001 SET @@session.server_id=#*//*!*/; -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=#*//*!*/; +/*M!100001 SET @@session.server_id=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -105,7 +105,7 @@ CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8) /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -120,7 +120,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -135,7 +135,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -150,7 +150,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -165,7 +165,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -180,7 +180,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; START TRANSACTION /*!*/; # at # @@ -195,7 +195,7 @@ COMMIT /*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl -/*!100001 SET @@session.gtid_seq_no=#*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=#*//*!*/; # at # #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=XXX/*!*/; diff --git a/mysql-test/suite/binlog/r/flashback.result b/mysql-test/suite/binlog/r/flashback.result index ebbbeef9572..4aff1ba93ec 100644 --- a/mysql-test/suite/binlog/r/flashback.result +++ b/mysql-test/suite/binlog/r/flashback.result @@ -51,10 +51,10 @@ ROLLBACK/*!*/; #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001 # at # #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -80,7 +80,7 @@ c08 TEXT /*!*/; # at # #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; START TRANSACTION /*!*/; # at # @@ -106,7 +106,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -132,7 +132,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -158,7 +158,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 trans -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -212,7 +212,7 @@ START TRANSACTION COMMIT/*!*/; # at # #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 trans -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # diff --git a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result index 31b988a2c03..100572dd2a3 100644 --- a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result +++ b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result @@ -112,10 +112,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -131,7 +131,7 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -139,7 +139,7 @@ CREATE DATABASE test2 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -147,7 +147,7 @@ CREATE DATABASE test3 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -174,7 +174,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -201,7 +201,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -228,7 +228,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -270,7 +270,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -297,7 +297,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -353,10 +353,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -372,15 +372,15 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -407,7 +407,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -420,7 +420,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -433,7 +433,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -463,7 +463,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -476,7 +476,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -515,10 +515,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -534,7 +534,7 @@ CREATE DATABASE test1 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -542,7 +542,7 @@ CREATE DATABASE test2 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -550,7 +550,7 @@ CREATE DATABASE test3 /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-4 -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -574,7 +574,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-5 -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -598,7 +598,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-6 -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -622,7 +622,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-7 -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -659,7 +659,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-8 -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; START TRANSACTION /*!*/; # at # @@ -683,7 +683,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # GTID 0-1-9 -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # diff --git a/mysql-test/suite/compat/oracle/r/column_compression.result b/mysql-test/suite/compat/oracle/r/column_compression.result index 10fc92480c0..9e4f758bb58 100644 --- a/mysql-test/suite/compat/oracle/r/column_compression.result +++ b/mysql-test/suite/compat/oracle/r/column_compression.result @@ -24,10 +24,10 @@ d TINYTEXT COMPRESSED BINARY SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid("a")), - "b" varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - "c" varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - "d" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid("a")), + "b" varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, + "c" varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + "d" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; # @@ -41,49 +41,49 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) DROP TABLE t1; # @@ -94,35 +94,35 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT '' + "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -134,7 +134,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) ASCII COMPRESSED); @@ -143,7 +143,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) BYTE COMPRESSED); @@ -152,7 +152,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -192,49 +192,49 @@ CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) DROP TABLE t1; # @@ -245,35 +245,35 @@ CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT '' + "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -285,7 +285,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) ASCII COMPRESSED); @@ -294,7 +294,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR2(10) BYTE COMPRESSED); @@ -303,7 +303,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -343,49 +343,49 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) DROP TABLE t1; # @@ -396,35 +396,35 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ DEFAULT '' + "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -436,7 +436,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT ASCII COMPRESSED); @@ -445,7 +445,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinytext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYTEXT BYTE COMPRESSED); @@ -454,7 +454,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -494,49 +494,49 @@ CREATE TABLE t1 (a TEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" blob(65535) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) DROP TABLE t1; # @@ -547,35 +547,35 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT '' + "a" blob(65535) /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ DEFAULT '' + "a" text /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -587,7 +587,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT ASCII COMPRESSED); @@ -596,7 +596,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" text /*!100301 COMPRESSED*/ DEFAULT NULL + "a" text /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TEXT BYTE COMPRESSED); @@ -605,7 +605,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" blob(65535) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -645,49 +645,49 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) DROP TABLE t1; # @@ -698,35 +698,35 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT '' + "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -738,7 +738,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT ASCII COMPRESSED); @@ -747,7 +747,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMTEXT BYTE COMPRESSED); @@ -756,7 +756,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -796,49 +796,49 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED UNICODE); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) DROP TABLE t1; # @@ -849,35 +849,35 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ DEFAULT '' + "a" longtext /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL ) DROP TABLE t1; # @@ -889,7 +889,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT ASCII COMPRESSED); @@ -898,7 +898,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longtext /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longtext /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGTEXT BYTE COMPRESSED); @@ -907,7 +907,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -949,7 +949,7 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -960,21 +960,21 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + "a" varchar(10) /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) DROP TABLE t1; # @@ -986,7 +986,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT '' + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(10) NULL COMPRESSED); @@ -995,7 +995,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1024,7 +1024,7 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1035,21 +1035,21 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TINYBLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a TINYBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + "a" tinyblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) DROP TABLE t1; # @@ -1061,7 +1061,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a TINYBLOB NULL COMPRESSED); @@ -1070,7 +1070,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1099,7 +1099,7 @@ CREATE TABLE t1 (a BLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1110,21 +1110,21 @@ CREATE TABLE t1 (a BLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a BLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a BLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + "a" longblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) DROP TABLE t1; # @@ -1136,7 +1136,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a BLOB NULL COMPRESSED); @@ -1145,7 +1145,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1174,7 +1174,7 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1185,21 +1185,21 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + "a" mediumblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) DROP TABLE t1; # @@ -1211,7 +1211,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a MEDIUMBLOB NULL COMPRESSED); @@ -1220,7 +1220,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1249,7 +1249,7 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1260,21 +1260,21 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED DEFAULT ''); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a LONGBLOB COMPRESSED NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a LONGBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL + "a" longblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL ) DROP TABLE t1; # @@ -1286,7 +1286,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT '' + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT '' ) DROP TABLE t1; CREATE TABLE t1 (a LONGBLOB NULL COMPRESSED); @@ -1295,7 +1295,7 @@ Warning 1287 ' ... COMPRESSED...' is deprecate SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL + "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL ) DROP TABLE t1; # @@ -1324,7 +1324,7 @@ CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL ) DROP TABLE t1; CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED BINARY COMPRESSED); diff --git a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result index b7019d051e1..c2d871cdba4 100644 --- a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result +++ b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result @@ -191,10 +191,10 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint slave-bin.000001 # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-1 ddl -/*!100101 SET @@session.skip_parallel_replication=0*//*!*/; -/*!100001 SET @@session.gtid_domain_id=0*//*!*/; -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=1*//*!*/; +/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; +/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 use `test`/*!*/; @@ -211,7 +211,7 @@ CREATE TABLE t1 (a INT, b INT, c INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-2 ddl -/*!100001 SET @@session.gtid_seq_no=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -219,8 +219,8 @@ CREATE TABLE t2 (a INT, b INT, c INT) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-2-3 ddl -/*!100001 SET @@session.server_id=2*//*!*/; -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.server_id=2*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -228,8 +228,8 @@ ALTER TABLE t1 ENGINE=BLACKHOLE /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-3 trans -/*!100001 SET @@session.server_id=1*//*!*/; -/*!100001 SET @@session.gtid_seq_no=3*//*!*/; +/*M!100001 SET @@session.server_id=1*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; START TRANSACTION /*!*/; # at # @@ -247,7 +247,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-4 trans -/*!100001 SET @@session.gtid_seq_no=4*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; START TRANSACTION /*!*/; # at # @@ -265,7 +265,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-5 trans -/*!100001 SET @@session.gtid_seq_no=5*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; START TRANSACTION /*!*/; # at # @@ -283,7 +283,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-6 trans -/*!100001 SET @@session.gtid_seq_no=6*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; START TRANSACTION /*!*/; # at # @@ -301,7 +301,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-7 trans -/*!100001 SET @@session.gtid_seq_no=7*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; START TRANSACTION /*!*/; # at # @@ -319,7 +319,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-8 ddl -/*!100001 SET @@session.gtid_seq_no=8*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -327,7 +327,7 @@ ALTER TABLE t1 ADD PRIMARY KEY pk_t1 (a,b) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-9 trans -/*!100001 SET @@session.gtid_seq_no=9*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; START TRANSACTION /*!*/; # at # @@ -345,7 +345,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-10 trans -/*!100001 SET @@session.gtid_seq_no=10*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; START TRANSACTION /*!*/; # at # @@ -363,7 +363,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-11 trans -/*!100001 SET @@session.gtid_seq_no=11*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=11*//*!*/; START TRANSACTION /*!*/; # at # @@ -381,7 +381,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-12 ddl -/*!100001 SET @@session.gtid_seq_no=12*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=12*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; @@ -389,7 +389,7 @@ ALTER TABLE t1 DROP PRIMARY KEY, ADD KEY key_t1 (a) /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-13 trans -/*!100001 SET @@session.gtid_seq_no=13*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=13*//*!*/; START TRANSACTION /*!*/; # at # @@ -407,7 +407,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-14 trans -/*!100001 SET @@session.gtid_seq_no=14*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=14*//*!*/; START TRANSACTION /*!*/; # at # @@ -425,7 +425,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-15 trans -/*!100001 SET @@session.gtid_seq_no=15*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=15*//*!*/; START TRANSACTION /*!*/; # at # @@ -443,7 +443,7 @@ COMMIT /*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-16 ddl -/*!100001 SET @@session.gtid_seq_no=16*//*!*/; +/*M!100001 SET @@session.gtid_seq_no=16*//*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 SET TIMESTAMP=1000000000/*!*/; diff --git a/sql/field.h b/sql/field.h index 5aa50294b0a..f249c00fb05 100644 --- a/sql/field.h +++ b/sql/field.h @@ -4255,7 +4255,7 @@ private: void sql_type(String &str) const override { Field_varstring::sql_type(str); - str.append(STRING_WITH_LEN(" /*!100301 COMPRESSED*/")); + str.append(STRING_WITH_LEN(" /*M!100301 COMPRESSED*/")); } uint32 max_display_length() const override { return field_length - 1; } uint32 character_octet_length() const override { return field_length - 1; } @@ -4691,7 +4691,7 @@ private: void sql_type(String &str) const override { Field_blob::sql_type(str); - str.append(STRING_WITH_LEN(" /*!100301 COMPRESSED*/")); + str.append(STRING_WITH_LEN(" /*M!100301 COMPRESSED*/")); } /* diff --git a/sql/log_event_client.cc b/sql/log_event_client.cc index 654701afaa0..11fabbbca39 100644 --- a/sql/log_event_client.cc +++ b/sql/log_event_client.cc @@ -3863,7 +3863,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info) print_event_info->allow_parallel != !!(flags2 & FL_ALLOW_PARALLEL)) { if (my_b_printf(&cache, - "/*!100101 SET @@session.skip_parallel_replication=%u*/%s\n", + "/*M!100101 SET @@session.skip_parallel_replication=%u*/%s\n", !(flags2 & FL_ALLOW_PARALLEL), print_event_info->delimiter)) goto err; @@ -3875,7 +3875,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info) print_event_info->domain_id != domain_id) { if (my_b_printf(&cache, - "/*!100001 SET @@session.gtid_domain_id=%u*/%s\n", + "/*M!100001 SET @@session.gtid_domain_id=%u*/%s\n", domain_id, print_event_info->delimiter)) goto err; print_event_info->domain_id= domain_id; @@ -3885,7 +3885,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info) if (!print_event_info->server_id_printed || print_event_info->server_id != server_id) { - if (my_b_printf(&cache, "/*!100001 SET @@session.server_id=%u*/%s\n", + if (my_b_printf(&cache, "/*M!100001 SET @@session.server_id=%u*/%s\n", server_id, print_event_info->delimiter)) goto err; print_event_info->server_id= server_id; @@ -3893,7 +3893,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info) } if (!is_flashback) - if (my_b_printf(&cache, "/*!100001 SET @@session.gtid_seq_no=%s*/%s\n", + if (my_b_printf(&cache, "/*M!100001 SET @@session.gtid_seq_no=%s*/%s\n", buf, print_event_info->delimiter)) goto err; } From d20518168aff435a4843eebb108e5b9df24c19fb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 17 Jun 2024 15:54:30 +0200 Subject: [PATCH 27/33] also protect the /*!999999 sandbox comment --- client/mysqldump.c | 2 +- mysql-test/main/ddl_i18n_koi8r.result | 12 +- mysql-test/main/ddl_i18n_utf8.result | 12 +- mysql-test/main/lock_view.result | 4 +- mysql-test/main/mysql.result | 4 +- mysql-test/main/mysqldump-compat-102.result | 2 +- mysql-test/main/mysqldump-max.result | 4 +- mysql-test/main/mysqldump-nl.result | 4 +- mysql-test/main/mysqldump-no-binlog.result | 2 +- mysql-test/main/mysqldump-system.result | 6 +- mysql-test/main/mysqldump-timing.result | 4 +- mysql-test/main/mysqldump-utf8mb4.result | 2 +- mysql-test/main/mysqldump.result | 203 +++++++++--------- mysql-test/main/openssl_1.result | 6 +- mysql-test/main/plugin_auth.result | 2 +- mysql-test/main/rpl_mysqldump_slave.result | 34 +-- mysql-test/main/trigger_wl3253.result | 4 +- .../suite/archive/archive_bitfield.result | 2 +- .../r/mysqldump_restore_func_qualified.result | 2 +- .../oracle/r/sp-package-mysqldump.result | 2 +- mysql-test/suite/federated/federatedx.result | 2 +- mysql-test/suite/roles/definer.result | 2 +- mysql-test/suite/s3/mysqldump.result | 4 +- .../suite/sql_sequence/mysqldump.result | 10 +- .../connect/mysql-test/connect/r/mysql.result | 2 +- 25 files changed, 168 insertions(+), 165 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index 867bb620b00..65ea08b8774 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -755,7 +755,7 @@ static void write_header(FILE *sql_file, const char *db_name) } else { - fprintf(sql_file, "/*!999999\\- enable the sandbox mode */ \n"); + fprintf(sql_file, "/*M!999999\\- enable the sandbox mode */ \n"); if (!opt_compact) { print_comment(sql_file, 0, diff --git a/mysql-test/main/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result index ab5104123a0..be375e501cd 100644 --- a/mysql-test/main/ddl_i18n_koi8r.result +++ b/mysql-test/main/ddl_i18n_koi8r.result @@ -719,7 +719,7 @@ ca cb utf8_general_ci utf8_general_ci ---> Dump of mysqltest1 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -796,7 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ; ---> Dumping mysqltest1 to ddl_i18n_koi8r.sp.mysqltest1.sql ---> Dump of mysqltest2 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -1725,7 +1725,7 @@ koi8r_general_ci utf8_general_ci koi8r_general_ci koi8r_general_ci utf8_general_ DELETE FROM mysqltest2.log| ---> Dump of mysqltest1 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -1805,7 +1805,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ; ---> Dumping mysqltest1 to ddl_i18n_koi8r.triggers.mysqltest1.sql ---> Dump of mysqltest2 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -2489,7 +2489,7 @@ COLLATION( ' END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci ---> Dump of mysqltest1 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -2557,7 +2557,7 @@ DELIMITER ; ---> Dumping mysqltest1 to ddl_i18n_koi8r.events.mysqltest1.sql ---> Dump of mysqltest2 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; diff --git a/mysql-test/main/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result index 457f68a33af..ef1b7e62d40 100644 --- a/mysql-test/main/ddl_i18n_utf8.result +++ b/mysql-test/main/ddl_i18n_utf8.result @@ -719,7 +719,7 @@ ca cb utf8_general_ci utf8_general_ci ---> Dump of mysqltest1 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -796,7 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ; ---> Dumping mysqltest1 to ddl_i18n_utf8sp.mysqltest1.sql ---> Dump of mysqltest2 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -1725,7 +1725,7 @@ utf8_general_ci utf8_general_ci koi8r_general_ci utf8_general_ci utf8_general_ci DELETE FROM mysqltest2.log| ---> Dump of mysqltest1 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -1805,7 +1805,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ; ---> Dumping mysqltest1 to ddl_i18n_utf8triggers.mysqltest1.sql ---> Dump of mysqltest2 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -2489,7 +2489,7 @@ COLLATION( 'текст') AS c4, END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci ---> Dump of mysqltest1 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; @@ -2557,7 +2557,7 @@ DELIMITER ; ---> Dumping mysqltest1 to ddl_i18n_utf8events.mysqltest1.sql ---> Dump of mysqltest2 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */; diff --git a/mysql-test/main/lock_view.result b/mysql-test/main/lock_view.result index 3d710f38936..cd693032d87 100644 --- a/mysql-test/main/lock_view.result +++ b/mysql-test/main/lock_view.result @@ -16,7 +16,7 @@ create definer=definer@localhost view mysqltest3.v3is as select schema_name from create definer=definer@localhost view mysqltest3.v3ps as select user from performance_schema.users where current_connections>0 order by user; create definer=definer@localhost view mysqltest3.v3nt as select 1; create definer=definer@localhost sql security invoker view mysqltest3.v3i as select * from mysqltest1.t1; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */; @@ -236,7 +236,7 @@ create view v1 as select * from (select * from t1) dt; lock table v1 read; disconnect con1; connection default; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; /*!50001 CREATE VIEW `v1` AS SELECT diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result index 0bb447df47a..1e02cd9f595 100644 --- a/mysql-test/main/mysql.result +++ b/mysql-test/main/mysql.result @@ -560,7 +560,7 @@ Table Create Table a1\`b1 CREATE TABLE `a1\``b1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `a1\``b1` ( @@ -590,7 +590,7 @@ Table Create Table a1\"b1 CREATE TABLE "a1\""b1" ( "a" int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE "a1\""b1" ( diff --git a/mysql-test/main/mysqldump-compat-102.result b/mysql-test/main/mysqldump-compat-102.result index d5ed54570e2..d3cc35d3c19 100644 --- a/mysql-test/main/mysqldump-compat-102.result +++ b/mysql-test/main/mysqldump-compat-102.result @@ -58,7 +58,7 @@ BEGIN log(0, 'Session ' || connection_id() || ' ' || current_user || ' started'); END; $$ -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ -- MariaDB dump DUMPVERSION Distrib DISTVERSION, for OS -- -- Host: localhost Database: db1_mdev17429 diff --git a/mysql-test/main/mysqldump-max.result b/mysql-test/main/mysqldump-max.result index 28c111d37b7..4a2fe09d44d 100644 --- a/mysql-test/main/mysqldump-max.result +++ b/mysql-test/main/mysqldump-max.result @@ -77,7 +77,7 @@ id name 3 first value 4 first value 5 first value -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -175,7 +175,7 @@ INSERT IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first val /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/mysql-test/main/mysqldump-nl.result b/mysql-test/main/mysqldump-nl.result index 1e9928308fc..56e9c56bae2 100644 --- a/mysql-test/main/mysqldump-nl.result +++ b/mysql-test/main/mysqldump-nl.result @@ -12,7 +12,7 @@ create procedure sp() select * from `v1 1v`; flush tables; use test; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ -- -- Current Database: `mysqltest1 @@ -135,7 +135,7 @@ test\` \! ls # test` -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ -- -- Current Database: `test``` diff --git a/mysql-test/main/mysqldump-no-binlog.result b/mysql-test/main/mysqldump-no-binlog.result index 669675ff21b..995f576e0db 100644 --- a/mysql-test/main/mysqldump-no-binlog.result +++ b/mysql-test/main/mysqldump-no-binlog.result @@ -1,2 +1,2 @@ mariadb-dump: Error: Binlogging on server not active -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ diff --git a/mysql-test/main/mysqldump-system.result b/mysql-test/main/mysqldump-system.result index 98cdd16abef..5bfe363d694 100644 --- a/mysql-test/main/mysqldump-system.result +++ b/mysql-test/main/mysqldump-system.result @@ -38,7 +38,7 @@ CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; # # mysqldump of system tables with --system=all # -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -163,7 +163,7 @@ UNLOCK TABLES; # # mysqldump of system tables with --system=all --replace # -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -309,7 +309,7 @@ UNLOCK TABLES; # # mysqldump of system tables with --system=all --insert-ignore # -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/mysql-test/main/mysqldump-timing.result b/mysql-test/main/mysqldump-timing.result index e70aaf3b0f8..2ac132412f9 100644 --- a/mysql-test/main/mysqldump-timing.result +++ b/mysql-test/main/mysqldump-timing.result @@ -7,7 +7,7 @@ CREATE TABLE t1 (i INT); INSERT INTO t1 VALUES (0); LOCK TABLE t1 WRITE; timeout without t1 contents expected -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -31,7 +31,7 @@ SET @save_max_statement_time=@@max_statement_time; SET GLOBAL max_statement_time=0.1; UNLOCK TABLES;; This would be a race condition otherwise, but default max_statement_time=0 makes it succeed -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/mysql-test/main/mysqldump-utf8mb4.result b/mysql-test/main/mysqldump-utf8mb4.result index ce321a59361..dc2ec06554e 100644 --- a/mysql-test/main/mysqldump-utf8mb4.result +++ b/mysql-test/main/mysqldump-utf8mb4.result @@ -32,7 +32,7 @@ Testing XML format output ---- Testing text format output ---- -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result index b69e6168c86..08725299a38 100644 --- a/mysql-test/main/mysqldump.result +++ b/mysql-test/main/mysqldump.result @@ -31,7 +31,7 @@ DROP TABLE t1; CREATE TABLE t1 (a decimal(64, 20)); INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), ("0987654321098765432109876543210987654321"); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( @@ -47,7 +47,7 @@ CREATE TABLE t1 (a double); INSERT IGNORE INTO t1 VALUES ('-9e999999'); Warnings: Warning 1264 Out of range value for column 'a' at row 1 -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( @@ -69,7 +69,7 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456); INSERT INTO t1 VALUES ("1.2345", 2.3456); ERROR 42S22: Unknown column '1.2345' in 'field list' SET SQL_MODE=@OLD_SQL_MODE; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( @@ -78,7 +78,7 @@ CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1.23450,2.3456),(1.23450,2.3456),(1.23450,2.3456),(1.23450,2.3456),(1.23450,2.3456); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t1` ( @@ -87,7 +87,7 @@ CREATE TABLE `t1` ( ); /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `t1` VALUES (1.23450,2.3456),(1.23450,2.3456),(1.23450,2.3456),(1.23450,2.3456),(1.23450,2.3456); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -123,7 +123,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -200,7 +200,7 @@ DROP TABLE t1; # CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r; INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -242,7 +242,7 @@ DROP TABLE t1; # CREATE TABLE t1 (a int) ENGINE=MYISAM; INSERT INTO t1 VALUES (1), (2); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -266,7 +266,7 @@ UNLOCK TABLES; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -295,7 +295,7 @@ DROP TABLE t1; # Bug#2592 mysqldump doesn't quote "tricky" names correctly # create table ```a` (i int); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE ```a` ( @@ -307,7 +307,7 @@ drop table ```a`; # Bug#2591 mysqldump quotes names inconsistently # create table t1(a int); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -341,7 +341,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -368,7 +368,7 @@ UNLOCK TABLES; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; set global sql_mode='ANSI_QUOTES'; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -402,7 +402,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -435,7 +435,7 @@ drop table t1; # create table t1(a int); insert into t1 values (1),(2),(3); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -468,7 +468,7 @@ drop table t1; # # Bug#6101 create database problem # -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -495,7 +495,7 @@ USE `test`; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; create database mysqldump_test_db character set latin2 collate latin2_bin; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -530,7 +530,7 @@ drop database mysqldump_test_db; # if it is explicitly set. CREATE TABLE t1 (a CHAR(10)); INSERT INTO t1 VALUES (_latin1 ''); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -572,7 +572,7 @@ UNLOCK TABLES; # If the future we can move this command into a separate test with # checking that "mysqldump" is compiled with "latin1" # -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -596,7 +596,7 @@ UNLOCK TABLES; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -620,7 +620,7 @@ UNLOCK TABLES; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -652,7 +652,7 @@ CREATE TABLE t1 (a int); CREATE TABLE t2 (a int); INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t2 VALUES (4),(5),(6); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -694,7 +694,7 @@ DROP TABLE t2; # CREATE TABLE t1 (`b` blob); INSERT INTO `t1` VALUES (0x602010000280100005E71A); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -736,7 +736,7 @@ DROP TABLE t1; CREATE TABLE t1 (a INT) ENGINE=MyISAM; INSERT INTO t1 VALUES (1),(2),(3); INSERT INTO t1 VALUES (4),(5),(6); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -771,7 +771,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1141,7 +1141,7 @@ F_cd00692c3bfe59267d5ecfac5310286c int, F_6faa8040da20ef399b63a72d0e4ab575 int, F_fe73f687e5bc5280214e0486b273a5f9 int); insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1511,7 +1511,7 @@ drop table t1; # CREATE TABLE t1 (a int); INSERT INTO t1 VALUES (1),(2),(3); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1562,7 +1562,7 @@ CREATE TABLE t1 ( a INT ); CREATE TABLE t2 ( a INT ); INSERT INTO t1 VALUES (1), (2); INSERT INTO t2 VALUES (1), (2); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1598,7 +1598,7 @@ CREATE TABLE `t2` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1671,35 +1671,35 @@ create table t3(a varchar(30) primary key, b int not null); test_sequence ------ Testing with illegal table names ------ mariadb-dump: Couldn't find table: "\d-2-1.sql" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "\t1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "\t1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "\\t1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "t\1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "t\1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "t/1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "T_1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "T%1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "T'1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "T_1" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Couldn't find table: "T_" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ test_sequence ------ Testing with illegal database names ------ mariadb-dump: Got error: 1049: "Unknown database 'mysqldump_test_d'" when selecting the database -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ mariadb-dump: Got error: 1049: "Unknown database 'mysqld\ump_test_db'" when selecting the database -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ drop table t1, t2, t3; drop database mysqldump_test_db; use test; @@ -1761,7 +1761,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1793,7 +1793,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1912,7 +1912,7 @@ create table t1(a int); create table t2(a int); create table t3(a int); mariadb-dump: Couldn't find table: "non_existing" -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -1962,7 +1962,7 @@ drop table t1, t2, t3; create table t1 (a int); mariadb-dump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ `a` FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064) mariadb-dump: Got error: 1064: "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1" when retrieving data from server -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2004,7 +2004,7 @@ CREATE TABLE `t1` ( PRIMARY KEY (`a b`, `c"d`, `e``f`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; insert into t1 values (0815, 4711, 2006); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; /*!40103 SET TIME_ZONE='+00:00' */; /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; @@ -2034,7 +2034,7 @@ UNLOCK TABLES; /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2089,7 +2089,7 @@ INSERT INTO t2 VALUES ('bingo'); INSERT INTO t2 VALUES ('waffle'); INSERT INTO t2 VALUES ('lemon'); create view v2 as select * from t2 where a like 'a%' with check option; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2184,7 +2184,7 @@ drop database db1; use test; create table t1(a int); create view v1 as select * from t1; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2255,7 +2255,7 @@ INSERT INTO t2 VALUES ('bingo'); INSERT INTO t2 VALUES ('waffle'); INSERT INTO t2 VALUES ('lemon'); create view v2 as select * from t2 where a like 'a%' with check option; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2321,7 +2321,7 @@ use test; # CREATE TABLE t1 (a char(10)); INSERT INTO t1 VALUES ('\''); -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2368,7 +2368,7 @@ create view v1 as select * from v3 where b in (1, 2, 3, 4, 5, 6, 7); create view v2 as select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2518,7 +2518,7 @@ end if; end AFTER 0000-00-00 00:00:00 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci latin1_swedish_ci INSERT INTO t1 (a) VALUES (1),(2),(3),(22); update t1 set a = 4 where a=3; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2648,7 +2648,7 @@ DELIMITER ; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; -/*!999999\- enable the sandbox mode */ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -2796,7 +2796,7 @@ Warning 1287 '