summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc5
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0001.patch1392
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0002.patch38
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0003.patch138
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0004.patch7729
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0005.patch1431
6 files changed, 10733 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 951d3a28e8..3980948859 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -28,6 +28,11 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
28 file://CVE-2023-52969-CVE-20230-52970-0002.patch \ 28 file://CVE-2023-52969-CVE-20230-52970-0002.patch \
29 file://CVE-2023-52969-CVE-20230-52970-0003.patch \ 29 file://CVE-2023-52969-CVE-20230-52970-0003.patch \
30 file://CVE-2023-52969-CVE-20230-52970-0004.patch \ 30 file://CVE-2023-52969-CVE-20230-52970-0004.patch \
31 file://CVE-2024-21096-0001.patch \
32 file://CVE-2024-21096-0002.patch \
33 file://CVE-2024-21096-0003.patch \
34 file://CVE-2024-21096-0004.patch \
35 file://CVE-2024-21096-0005.patch \
31 " 36 "
32SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" 37SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
33 38
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0001.patch b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0001.patch
new file mode 100644
index 0000000000..6cea512788
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0001.patch
@@ -0,0 +1,1392 @@
1From 13663cb5c4558383e9dab96e501d72ceb7a0a158 Mon Sep 17 00:00:00 2001
2From: Sergei Golubchik <serg@mariadb.org>
3Date: Sun, 5 May 2024 17:37:37 +0200
4Subject: [PATCH] MDEV-33727 mariadb-dump trusts the server and does not
5 validate the data
6
7safety first - tell mariadb client not to execute dangerous
8cli commands, they cannot be present in the dump anyway.
9
10wrapping the command in /*!999999 ..... */ guarantees that
11if a non-mariadb-cli client loads the dump and sends it to the
12server - the server will ignore the command it doesn't understand
13
14CVE: CVE-2024-21096
15Upstream-Status: Backport [https://github.com/MariaDB/server/commit/13663cb5c4558383e9dab96e501d72ceb7a0a158]
16
17Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
18---
19 client/mysqldump.c | 87 ++++++-------
20 mysql-test/main/ddl_i18n_koi8r.result | 5 +
21 mysql-test/main/ddl_i18n_utf8.result | 6 +
22 mysql-test/main/lock_view.result | 2 +
23 mysql-test/main/mysql.result | 2 +
24 mysql-test/main/mysqldump-compat-102.result | 1 +
25 mysql-test/main/mysqldump-max.result | 2 +
26 mysql-test/main/mysqldump-nl.result | 2 +
27 mysql-test/main/mysqldump-no-binlog.result | 1 +
28 mysql-test/main/mysqldump-system.result | 3 +
29 mysql-test/main/mysqldump-timing.result | 2 +
30 mysql-test/main/mysqldump-utf8mb4.result | 1 +
31 mysql-test/main/mysqldump.result | 114 +++++++++++++++++-
32 mysql-test/main/mysqldump.test | 21 ++++
33 mysql-test/main/openssl_1.result | 5 +-
34 mysql-test/main/plugin_auth.result | 1 +
35 mysql-test/main/rpl_mysqldump_slave.result | 9 ++
36 mysql-test/main/trigger_wl3253.result | 2 +
37 .../suite/archive/archive_bitfield.result | 1 +
38 .../oracle/r/sp-package-mysqldump.result | 1 +
39 mysql-test/suite/federated/federatedx.result | 1 +
40 mysql-test/suite/roles/definer.result | 1 +
41 .../suite/sql_sequence/mysqldump.result | 5 +
42 .../connect/mysql-test/connect/r/mysql.result | 1 +
43 24 files changed, 232 insertions(+), 44 deletions(-)
44
45diff --git a/client/mysqldump.c b/client/mysqldump.c
46index d9c7df16..51a5af15 100644
47--- a/client/mysqldump.c
48+++ b/client/mysqldump.c
49@@ -762,56 +762,59 @@ static void write_header(FILE *sql_file, const char *db_name)
50 fputs(">\n", sql_file);
51 check_io(sql_file);
52 }
53- else if (!opt_compact)
54+ else
55 {
56- print_comment(sql_file, 0,
57- "-- MariaDB dump %s Distrib %s, for %s (%s)\n--\n",
58- DUMP_VERSION, MYSQL_SERVER_VERSION, SYSTEM_TYPE,
59- MACHINE_TYPE);
60- print_comment(sql_file, 0, "-- Host: %s ",
61- fix_for_comment(current_host ? current_host : "localhost"));
62- print_comment(sql_file, 0, "Database: %s\n",
63- fix_for_comment(db_name ? db_name : ""));
64- print_comment(sql_file, 0,
65- "-- ------------------------------------------------------\n"
66- );
67- print_comment(sql_file, 0, "-- Server version\t%s\n",
68- mysql_get_server_info(&mysql_connection));
69-
70- if (!opt_logging)
71- fprintf(sql_file,
72-"\n/*M!100101 SET LOCAL SQL_LOG_OFF=0, LOCAL SLOW_QUERY_LOG=0 */;");
73+ fprintf(sql_file, "/*!999999\\- enable the sandbox mode */ \n");
74+ if (!opt_compact)
75+ {
76+ print_comment(sql_file, 0,
77+ "-- MariaDB dump %s Distrib %s, for %s (%s)\n--\n",
78+ DUMP_VERSION, MYSQL_SERVER_VERSION, SYSTEM_TYPE,
79+ MACHINE_TYPE);
80+ print_comment(sql_file, 0, "-- Host: %s ",
81+ fix_for_comment(current_host ? current_host : "localhost"));
82+ print_comment(sql_file, 0, "Database: %s\n",
83+ fix_for_comment(db_name ? db_name : ""));
84+ print_comment(sql_file, 0,
85+ "-- ------------------------------------------------------\n"
86+ );
87+ print_comment(sql_file, 0, "-- Server version\t%s\n",
88+ mysql_get_server_info(&mysql_connection));
89+
90+ if (!opt_logging)
91+ fprintf(sql_file,
92+ "\n/*M!100101 SET LOCAL SQL_LOG_OFF=0, LOCAL SLOW_QUERY_LOG=0 */;");
93
94- if (opt_set_charset)
95- fprintf(sql_file,
96-"\n/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;"
97-"\n/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;"
98-"\n/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;"
99-"\n/*!40101 SET NAMES %s */;\n",default_charset);
100+ if (opt_set_charset)
101+ fprintf(sql_file,
102+ "\n/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;"
103+ "\n/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;"
104+ "\n/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;"
105+ "\n/*!40101 SET NAMES %s */;\n",default_charset);
106
107- if (opt_tz_utc)
108- {
109- fprintf(sql_file, "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;\n");
110- fprintf(sql_file, "/*!40103 SET TIME_ZONE='+00:00' */;\n");
111- }
112+ if (opt_tz_utc)
113+ {
114+ fprintf(sql_file, "/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;\n");
115+ fprintf(sql_file, "/*!40103 SET TIME_ZONE='+00:00' */;\n");
116+ }
117
118- if (!path)
119- {
120- if (!opt_no_create_info)
121+ if (!path)
122 {
123- /* We don't need unique checks as the table is created just before */
124+ if (!opt_no_create_info)
125+ {
126+ /* We don't need unique checks as the table is created just before */
127+ fprintf(md_result_file,"\
128+ /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n");
129+ }
130 fprintf(md_result_file,"\
131-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n");
132+ /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n");
133 }
134- fprintf(md_result_file,"\
135-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n\
136-");
137+ fprintf(sql_file,
138+ "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n"
139+ "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n",
140+ path?"":"NO_AUTO_VALUE_ON_ZERO",compatible_mode_normal_str[0]==0?"":",",
141+ compatible_mode_normal_str);
142 }
143- fprintf(sql_file,
144- "/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;\n"
145- "/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\n",
146- path?"":"NO_AUTO_VALUE_ON_ZERO",compatible_mode_normal_str[0]==0?"":",",
147- compatible_mode_normal_str);
148 check_io(sql_file);
149 }
150 } /* write_header */
151diff --git a/mysql-test/main/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result
152index f588374a..39bc4d4a 100644
153--- a/mysql-test/main/ddl_i18n_koi8r.result
154+++ b/mysql-test/main/ddl_i18n_koi8r.result
155@@ -719,6 +719,7 @@ ca cb
156 utf8mb3_general_ci utf8mb3_general_ci
157
158 ---> Dump of mysqltest1
159+/*!999999\- enable the sandbox mode */
160
161 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
162
163@@ -795,6 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
164 ---> Dumping mysqltest1 to ddl_i18n_koi8r.sp.mysqltest1.sql
165
166 ---> Dump of mysqltest2
167+/*!999999\- enable the sandbox mode */
168
169 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
170
171@@ -1723,6 +1725,7 @@ koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_ge
172 DELETE FROM mysqltest2.log|
173
174 ---> Dump of mysqltest1
175+/*!999999\- enable the sandbox mode */
176
177 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
178
179@@ -1805,6 +1808,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
180 ---> Dumping mysqltest1 to ddl_i18n_koi8r.triggers.mysqltest1.sql
181
182 ---> Dump of mysqltest2
183+/*!999999\- enable the sandbox mode */
184
185 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
186
187@@ -2491,6 +2495,7 @@ COLLATION( '
188 END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8mb3_unicode_ci
189
190 ---> Dump of mysqltest1
191+/*!999999\- enable the sandbox mode */
192
193 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
194
195diff --git a/mysql-test/main/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result
196index cb57bc5e..33ec6e6e 100644
197--- a/mysql-test/main/ddl_i18n_utf8.result
198+++ b/mysql-test/main/ddl_i18n_utf8.result
199@@ -719,6 +719,7 @@ ca cb
200 utf8mb3_general_ci utf8mb3_general_ci
201
202 ---> Dump of mysqltest1
203+/*!999999\- enable the sandbox mode */
204
205 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
206
207@@ -795,6 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
208 ---> Dumping mysqltest1 to ddl_i18n_utf8sp.mysqltest1.sql
209
210 ---> Dump of mysqltest2
211+/*!999999\- enable the sandbox mode */
212
213 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
214
215@@ -1723,6 +1725,7 @@ utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb
216 DELETE FROM mysqltest2.log|
217
218 ---> Dump of mysqltest1
219+/*!999999\- enable the sandbox mode */
220
221 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
222
223@@ -1805,6 +1808,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
224 ---> Dumping mysqltest1 to ddl_i18n_utf8triggers.mysqltest1.sql
225
226 ---> Dump of mysqltest2
227+/*!999999\- enable the sandbox mode */
228
229 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
230
231@@ -2491,6 +2495,7 @@ COLLATION( 'текÑÑ‚') AS c4,
232 END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci
233
234 ---> Dump of mysqltest1
235+/*!999999\- enable the sandbox mode */
236
237 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
238
239@@ -2558,6 +2563,7 @@ DELIMITER ;
240 ---> Dumping mysqltest1 to ddl_i18n_utf8events.mysqltest1.sql
241
242 ---> Dump of mysqltest2
243+/*!999999\- enable the sandbox mode */
244
245 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
246
247diff --git a/mysql-test/main/lock_view.result b/mysql-test/main/lock_view.result
248index 47a7e58e..04462ce7 100644
249--- a/mysql-test/main/lock_view.result
250+++ b/mysql-test/main/lock_view.result
251@@ -16,6 +16,7 @@ create definer=definer@localhost view mysqltest3.v3is as select schema_name from
252 create definer=definer@localhost view mysqltest3.v3ps as select user from performance_schema.users where current_connections>0 order by user;
253 create definer=definer@localhost view mysqltest3.v3nt as select 1;
254 create definer=definer@localhost sql security invoker view mysqltest3.v3i as select * from mysqltest1.t1;
255+/*!999999\- enable the sandbox mode */
256
257 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
258
259@@ -235,6 +236,7 @@ create view v1 as select * from (select * from t1) dt;
260 lock table v1 read;
261 disconnect con1;
262 connection default;
263+/*!999999\- enable the sandbox mode */
264 SET @saved_cs_client = @@character_set_client;
265 SET character_set_client = utf8;
266 /*!50001 CREATE VIEW `v1` AS SELECT
267diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result
268index 0b91b513..c2e42fda 100644
269--- a/mysql-test/main/mysql.result
270+++ b/mysql-test/main/mysql.result
271@@ -552,6 +552,7 @@ Table Create Table
272 a1\`b1 CREATE TABLE `a1\``b1` (
273 `a` int(11) DEFAULT NULL
274 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
275+/*!999999\- enable the sandbox mode */
276 /*!40101 SET @saved_cs_client = @@character_set_client */;
277 /*!40101 SET character_set_client = utf8 */;
278 CREATE TABLE `a1\``b1` (
279@@ -583,6 +584,7 @@ Table Create Table
280 a1\"b1 CREATE TABLE "a1\""b1" (
281 "a" int(11) DEFAULT NULL
282 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
283+/*!999999\- enable the sandbox mode */
284 /*!40101 SET @saved_cs_client = @@character_set_client */;
285 /*!40101 SET character_set_client = utf8 */;
286 CREATE TABLE "a1\""b1" (
287diff --git a/mysql-test/main/mysqldump-compat-102.result b/mysql-test/main/mysqldump-compat-102.result
288index 86a2ebc4..35a06d20 100644
289--- a/mysql-test/main/mysqldump-compat-102.result
290+++ b/mysql-test/main/mysqldump-compat-102.result
291@@ -58,6 +58,7 @@ BEGIN
292 log(0, 'Session ' || connection_id() || ' ' || current_user || ' started');
293 END;
294 $$
295+/*!999999\- enable the sandbox mode */
296 -- MariaDB dump DUMPVERSION Distrib DISTVERSION, for OS
297 --
298 -- Host: localhost Database: db1_mdev17429
299diff --git a/mysql-test/main/mysqldump-max.result b/mysql-test/main/mysqldump-max.result
300index 7dd1030e..86e8eb07 100644
301--- a/mysql-test/main/mysqldump-max.result
302+++ b/mysql-test/main/mysqldump-max.result
303@@ -77,6 +77,7 @@ id name
304 3 first value
305 4 first value
306 5 first value
307+/*!999999\- enable the sandbox mode */
308
309 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
310 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
311@@ -204,6 +205,7 @@ INSERT IGNORE INTO `t6` VALUES
312 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
313 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
314
315+/*!999999\- enable the sandbox mode */
316
317 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
318 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
319diff --git a/mysql-test/main/mysqldump-nl.result b/mysql-test/main/mysqldump-nl.result
320index 66902492..1cbc23f9 100644
321--- a/mysql-test/main/mysqldump-nl.result
322+++ b/mysql-test/main/mysqldump-nl.result
323@@ -12,6 +12,7 @@ create procedure sp() select * from `v1
324 1v`;
325 flush tables;
326 use test;
327+/*!999999\- enable the sandbox mode */
328
329 --
330 -- Current Database: `mysqltest1
331@@ -134,6 +135,7 @@ test\`
332 \! ls
333 #
334 test`
335+/*!999999\- enable the sandbox mode */
336
337 --
338 -- Current Database: `test```
339diff --git a/mysql-test/main/mysqldump-no-binlog.result b/mysql-test/main/mysqldump-no-binlog.result
340index 223034d8..b9dfb223 100644
341--- a/mysql-test/main/mysqldump-no-binlog.result
342+++ b/mysql-test/main/mysqldump-no-binlog.result
343@@ -1 +1,2 @@
344 mariadb-dump: Error: Binlogging on server not active
345+/*!999999\- enable the sandbox mode */
346diff --git a/mysql-test/main/mysqldump-system.result b/mysql-test/main/mysqldump-system.result
347index bf2d60c6..0b6fe995 100644
348--- a/mysql-test/main/mysqldump-system.result
349+++ b/mysql-test/main/mysqldump-system.result
350@@ -39,6 +39,7 @@ CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
351 #
352 # mysqldump of system tables with --system=all
353 #
354+/*!999999\- enable the sandbox mode */
355
356 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
357 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
358@@ -630,6 +631,7 @@ UNLOCK TABLES;
359 #
360 # mysqldump of system tables with --system=all --replace
361 #
362+/*!999999\- enable the sandbox mode */
363
364 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
365 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
366@@ -1244,6 +1246,7 @@ UNLOCK TABLES;
367 #
368 # mysqldump of system tables with --system=all --insert-ignore
369 #
370+/*!999999\- enable the sandbox mode */
371
372 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
373 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
374diff --git a/mysql-test/main/mysqldump-timing.result b/mysql-test/main/mysqldump-timing.result
375index 7fa11893..8ae621e5 100644
376--- a/mysql-test/main/mysqldump-timing.result
377+++ b/mysql-test/main/mysqldump-timing.result
378@@ -7,6 +7,7 @@ CREATE TABLE t1 (i INT);
379 INSERT INTO t1 VALUES (0);
380 LOCK TABLE t1 WRITE;
381 timeout without t1 contents expected
382+/*!999999\- enable the sandbox mode */
383
384 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
385 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
386@@ -30,6 +31,7 @@ SET @save_max_statement_time=@@max_statement_time;
387 SET GLOBAL max_statement_time=0.1;
388 UNLOCK TABLES;;
389 This would be a race condition otherwise, but default max_statement_time=0 makes it succeed
390+/*!999999\- enable the sandbox mode */
391
392 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
393 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
394diff --git a/mysql-test/main/mysqldump-utf8mb4.result b/mysql-test/main/mysqldump-utf8mb4.result
395index 90477130..e38c8a47 100644
396--- a/mysql-test/main/mysqldump-utf8mb4.result
397+++ b/mysql-test/main/mysqldump-utf8mb4.result
398@@ -32,6 +32,7 @@ Testing XML format output
399 ----
400 Testing text format output
401 ----
402+/*!999999\- enable the sandbox mode */
403
404 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
405 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
406diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
407index 0a84b89b..2f888ddd 100644
408--- a/mysql-test/main/mysqldump.result
409+++ b/mysql-test/main/mysqldump.result
410@@ -31,6 +31,7 @@ DROP TABLE t1;
411 CREATE TABLE t1 (a decimal(64, 20));
412 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
413 ("0987654321098765432109876543210987654321");
414+/*!999999\- enable the sandbox mode */
415 /*!40101 SET @saved_cs_client = @@character_set_client */;
416 /*!40101 SET character_set_client = utf8 */;
417 CREATE TABLE `t1` (
418@@ -48,6 +49,7 @@ CREATE TABLE t1 (a double);
419 INSERT IGNORE INTO t1 VALUES ('-9e999999');
420 Warnings:
421 Warning 1264 Out of range value for column 'a' at row 1
422+/*!999999\- enable the sandbox mode */
423 /*!40101 SET @saved_cs_client = @@character_set_client */;
424 /*!40101 SET character_set_client = utf8 */;
425 CREATE TABLE `t1` (
426@@ -70,6 +72,7 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456);
427 INSERT INTO t1 VALUES ("1.2345", 2.3456);
428 ERROR 42S22: Unknown column '1.2345' in 'field list'
429 SET SQL_MODE=@OLD_SQL_MODE;
430+/*!999999\- enable the sandbox mode */
431 /*!40101 SET @saved_cs_client = @@character_set_client */;
432 /*!40101 SET character_set_client = utf8 */;
433 CREATE TABLE `t1` (
434@@ -83,6 +86,7 @@ INSERT INTO `t1` VALUES
435 (1.23450,2.3456),
436 (1.23450,2.3456),
437 (1.23450,2.3456);
438+/*!999999\- enable the sandbox mode */
439 /*!40101 SET @saved_cs_client = @@character_set_client */;
440 /*!40101 SET character_set_client = utf8 */;
441 CREATE TABLE `t1` (
442@@ -96,6 +100,7 @@ INSERT INTO `t1` VALUES
443 (1.23450,2.3456),
444 (1.23450,2.3456),
445 (1.23450,2.3456);
446+/*!999999\- enable the sandbox mode */
447
448 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
449 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
450@@ -136,6 +141,7 @@ UNLOCK TABLES;
451 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
452 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
453
454+/*!999999\- enable the sandbox mode */
455 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
456 /*!40103 SET TIME_ZONE='+00:00' */;
457 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
458@@ -217,6 +223,7 @@ DROP TABLE t1;
459 #
460 CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r;
461 INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
462+/*!999999\- enable the sandbox mode */
463
464 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
465 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
466@@ -258,6 +265,7 @@ DROP TABLE t1;
467 #
468 CREATE TABLE t1 (a int) ENGINE=MYISAM;
469 INSERT INTO t1 VALUES (1), (2);
470+/*!999999\- enable the sandbox mode */
471 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
472 /*!40103 SET TIME_ZONE='+00:00' */;
473 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
474@@ -283,6 +291,7 @@ UNLOCK TABLES;
475 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
476 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
477
478+/*!999999\- enable the sandbox mode */
479 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
480 /*!40103 SET TIME_ZONE='+00:00' */;
481 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
482@@ -313,6 +322,7 @@ DROP TABLE t1;
483 # Bug#2592 mysqldump doesn't quote "tricky" names correctly
484 #
485 create table ```a` (i int);
486+/*!999999\- enable the sandbox mode */
487 /*!40101 SET @saved_cs_client = @@character_set_client */;
488 /*!40101 SET character_set_client = utf8 */;
489 CREATE TABLE ```a` (
490@@ -324,6 +334,7 @@ drop table ```a`;
491 # Bug#2591 mysqldump quotes names inconsistently
492 #
493 create table t1(a int);
494+/*!999999\- enable the sandbox mode */
495
496 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
497 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
498@@ -357,6 +368,7 @@ UNLOCK TABLES;
499 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
500 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
501
502+/*!999999\- enable the sandbox mode */
503 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
504 /*!40103 SET TIME_ZONE='+00:00' */;
505 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
506@@ -383,6 +395,7 @@ UNLOCK TABLES;
507 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
508
509 set global sql_mode='ANSI_QUOTES';
510+/*!999999\- enable the sandbox mode */
511
512 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
513 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
514@@ -416,6 +429,7 @@ UNLOCK TABLES;
515 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
516 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
517
518+/*!999999\- enable the sandbox mode */
519 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
520 /*!40103 SET TIME_ZONE='+00:00' */;
521 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
522@@ -448,6 +462,7 @@ drop table t1;
523 #
524 create table t1(a int);
525 insert into t1 values (1),(2),(3);
526+/*!999999\- enable the sandbox mode */
527
528 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
529 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
530@@ -480,6 +495,7 @@ drop table t1;
531 #
532 # Bug#6101 create database problem
533 #
534+/*!999999\- enable the sandbox mode */
535
536 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
537 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
538@@ -506,6 +522,7 @@ USE `test`;
539 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
540
541 create database mysqldump_test_db character set latin2 collate latin2_bin;
542+/*!999999\- enable the sandbox mode */
543
544 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
545 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
546@@ -540,6 +557,7 @@ drop database mysqldump_test_db;
547 # if it is explicitly set.
548 CREATE TABLE t1 (a CHAR(10));
549 INSERT INTO t1 VALUES (_latin1 'ÄÖÜß');
550+/*!999999\- enable the sandbox mode */
551
552 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
553 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
554@@ -582,6 +600,7 @@ UNLOCK TABLES;
555 # If the future we can move this command into a separate test with
556 # checking that "mysqldump" is compiled with "latin1"
557 #
558+/*!999999\- enable the sandbox mode */
559 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
560 /*!40103 SET TIME_ZONE='+00:00' */;
561 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
562@@ -606,6 +625,7 @@ UNLOCK TABLES;
563 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
564 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
565
566+/*!999999\- enable the sandbox mode */
567 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
568 /*!40103 SET TIME_ZONE='+00:00' */;
569 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
570@@ -630,6 +650,7 @@ UNLOCK TABLES;
571 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
572 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
573
574+/*!999999\- enable the sandbox mode */
575 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
576 /*!40103 SET TIME_ZONE='+00:00' */;
577 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
578@@ -662,6 +683,7 @@ CREATE TABLE t1 (a int);
579 CREATE TABLE t2 (a int);
580 INSERT INTO t1 VALUES (1),(2),(3);
581 INSERT INTO t2 VALUES (4),(5),(6);
582+/*!999999\- enable the sandbox mode */
583
584 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
585 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
586@@ -706,6 +728,7 @@ DROP TABLE t2;
587 #
588 CREATE TABLE t1 (`b` blob);
589 INSERT INTO `t1` VALUES (0x602010000280100005E71A);
590+/*!999999\- enable the sandbox mode */
591
592 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
593 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
594@@ -747,6 +770,7 @@ DROP TABLE t1;
595 CREATE TABLE t1 (a INT) ENGINE=MyISAM;
596 INSERT INTO t1 VALUES (1),(2),(3);
597 INSERT INTO t1 VALUES (4),(5),(6);
598+/*!999999\- enable the sandbox mode */
599
600 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
601 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
602@@ -787,6 +811,7 @@ UNLOCK TABLES;
603 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
604 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
605
606+/*!999999\- enable the sandbox mode */
607
608 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
609 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
610@@ -1162,6 +1187,7 @@ F_cd00692c3bfe59267d5ecfac5310286c int,
611 F_6faa8040da20ef399b63a72d0e4ab575 int,
612 F_fe73f687e5bc5280214e0486b273a5f9 int);
613 insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
614+/*!999999\- enable the sandbox mode */
615
616 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
617 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
618@@ -1531,6 +1557,7 @@ drop table t1;
619 #
620 CREATE TABLE t1 (a int);
621 INSERT INTO t1 VALUES (1),(2),(3);
622+/*!999999\- enable the sandbox mode */
623
624 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
625 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
626@@ -1584,6 +1611,7 @@ CREATE TABLE t1 ( a INT );
627 CREATE TABLE t2 ( a INT );
628 INSERT INTO t1 VALUES (1), (2);
629 INSERT INTO t2 VALUES (1), (2);
630+/*!999999\- enable the sandbox mode */
631
632 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
633 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
634@@ -1619,6 +1647,7 @@ CREATE TABLE `t2` (
635 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
636 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
637
638+/*!999999\- enable the sandbox mode */
639
640 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
641 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
642@@ -1691,21 +1720,35 @@ create table t3(a varchar(30) primary key, b int not null);
643 test_sequence
644 ------ Testing with illegal table names ------
645 mariadb-dump: Couldn't find table: "\d-2-1.sql"
646+/*!999999\- enable the sandbox mode */
647 mariadb-dump: Couldn't find table: "\t1"
648+/*!999999\- enable the sandbox mode */
649 mariadb-dump: Couldn't find table: "\t1"
650+/*!999999\- enable the sandbox mode */
651 mariadb-dump: Couldn't find table: "\\t1"
652+/*!999999\- enable the sandbox mode */
653 mariadb-dump: Couldn't find table: "t\1"
654+/*!999999\- enable the sandbox mode */
655 mariadb-dump: Couldn't find table: "t\1"
656+/*!999999\- enable the sandbox mode */
657 mariadb-dump: Couldn't find table: "t/1"
658+/*!999999\- enable the sandbox mode */
659 mariadb-dump: Couldn't find table: "T_1"
660+/*!999999\- enable the sandbox mode */
661 mariadb-dump: Couldn't find table: "T%1"
662+/*!999999\- enable the sandbox mode */
663 mariadb-dump: Couldn't find table: "T'1"
664+/*!999999\- enable the sandbox mode */
665 mariadb-dump: Couldn't find table: "T_1"
666+/*!999999\- enable the sandbox mode */
667 mariadb-dump: Couldn't find table: "T_"
668+/*!999999\- enable the sandbox mode */
669 test_sequence
670 ------ Testing with illegal database names ------
671 mariadb-dump: Got error: 1049: "Unknown database 'mysqldump_test_d'" when selecting the database
672+/*!999999\- enable the sandbox mode */
673 mariadb-dump: Got error: 1049: "Unknown database 'mysqld\ump_test_db'" when selecting the database
674+/*!999999\- enable the sandbox mode */
675 drop table t1, t2, t3;
676 drop database mysqldump_test_db;
677 use test;
678@@ -1767,6 +1810,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
679 </table_data>
680 </database>
681 </mysqldump>
682+/*!999999\- enable the sandbox mode */
683
684 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
685 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
686@@ -1805,6 +1849,7 @@ UNLOCK TABLES;
687 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
688 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
689
690+/*!999999\- enable the sandbox mode */
691
692 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
693 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
694@@ -1930,6 +1975,7 @@ create table t1(a int);
695 create table t2(a int);
696 create table t3(a int);
697 mariadb-dump: Couldn't find table: "non_existing"
698+/*!999999\- enable the sandbox mode */
699
700 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
701 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
702@@ -1979,6 +2025,7 @@ drop table t1, t2, t3;
703 create table t1 (a int);
704 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)
705 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
706+/*!999999\- enable the sandbox mode */
707
708 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
709 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
710@@ -2020,6 +2067,7 @@ CREATE TABLE `t1` (
711 PRIMARY KEY (`a b`, `c"d`, `e``f`)
712 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
713 insert into t1 values (0815, 4711, 2006);
714+/*!999999\- enable the sandbox mode */
715 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
716 /*!40103 SET TIME_ZONE='+00:00' */;
717 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
718@@ -2050,6 +2098,7 @@ UNLOCK TABLES;
719 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
720 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
721
722+/*!999999\- enable the sandbox mode */
723
724 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
725 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
726@@ -2105,6 +2154,7 @@ INSERT INTO t2 VALUES ('bingo');
727 INSERT INTO t2 VALUES ('waffle');
728 INSERT INTO t2 VALUES ('lemon');
729 create view v2 as select * from t2 where a like 'a%' with check option;
730+/*!999999\- enable the sandbox mode */
731
732 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
733 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
734@@ -2204,6 +2254,7 @@ drop database db1;
735 use test;
736 create table t1(a int);
737 create view v1 as select * from t1;
738+/*!999999\- enable the sandbox mode */
739
740 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
741 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
742@@ -2274,6 +2325,7 @@ INSERT INTO t2 VALUES ('bingo');
743 INSERT INTO t2 VALUES ('waffle');
744 INSERT INTO t2 VALUES ('lemon');
745 create view v2 as select * from t2 where a like 'a%' with check option;
746+/*!999999\- enable the sandbox mode */
747
748 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
749 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
750@@ -2344,6 +2396,7 @@ use test;
751 #
752 CREATE TABLE t1 (a char(10));
753 INSERT INTO t1 VALUES ('\'');
754+/*!999999\- enable the sandbox mode */
755
756 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
757 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
758@@ -2391,6 +2444,7 @@ create view v1 as
759 select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);
760 create view v2 as
761 select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
762+/*!999999\- enable the sandbox mode */
763
764 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
765 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
766@@ -2543,6 +2597,7 @@ end if;
767 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
768 INSERT INTO t1 (a) VALUES (1),(2),(3),(22);
769 update t1 set a = 4 where a=3;
770+/*!999999\- enable the sandbox mode */
771
772 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
773 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
774@@ -2676,6 +2731,7 @@ DELIMITER ;
775 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
776 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
777
778+/*!999999\- enable the sandbox mode */
779
780 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
781 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
782@@ -2827,6 +2883,7 @@ Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be
783 set sql_mode='ansi';
784 create procedure `a'b` () select 1;
785 set sql_mode='';
786+/*!999999\- enable the sandbox mode */
787
788 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
789 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
790@@ -2983,6 +3040,7 @@ d
791 2003-10-26 02:00:00
792 2003-10-26 02:00:00
793 set global time_zone='Europe/Moscow';
794+/*!999999\- enable the sandbox mode */
795
796 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
797 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
798@@ -3024,6 +3082,7 @@ UNLOCK TABLES;
799 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
800 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
801
802+/*!999999\- enable the sandbox mode */
803
804 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
805 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
806@@ -3086,6 +3145,7 @@ a2
807 1
808 2
809 3
810+/*!999999\- enable the sandbox mode */
811 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
812 /*!40103 SET TIME_ZONE='+00:00' */;
813 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
814@@ -3166,6 +3226,7 @@ a b c
815 1 first value xxxx
816 2 second value tttt
817 3 third value vvv vvv
818+/*!999999\- enable the sandbox mode */
819
820 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
821 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
822@@ -3294,6 +3355,7 @@ BEGIN
823 SET new.a = 0;
824 END|
825 SET SQL_MODE = @old_sql_mode;
826+/*!999999\- enable the sandbox mode */
827
828 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
829 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
830@@ -3357,6 +3419,7 @@ DROP TABLE t1;
831 #
832 create table t1 (a binary(1), b blob);
833 insert into t1 values ('','');
834+/*!999999\- enable the sandbox mode */
835
836 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
837 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
838@@ -3392,6 +3455,7 @@ UNLOCK TABLES;
839 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
840 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
841
842+/*!999999\- enable the sandbox mode */
843
844 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
845 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
846@@ -3492,6 +3556,7 @@ insert into t values(5, 51);
847 create view v1 as select qty, price, qty*price as value from t;
848 create view v2 as select qty from v1;
849 mysqldump {
850+/*!999999\- enable the sandbox mode */
851 /*!50001 DROP VIEW IF EXISTS `v1`*/;
852 /*!50001 SET @saved_cs_client = @@character_set_client */;
853 /*!50001 SET @saved_cs_results = @@character_set_results */;
854@@ -3507,6 +3572,7 @@ mysqldump {
855 /*!50001 SET collation_connection = @saved_col_connection */;
856
857 } mysqldump {
858+/*!999999\- enable the sandbox mode */
859 /*!50001 DROP VIEW IF EXISTS `v2`*/;
860 /*!50001 SET @saved_cs_client = @@character_set_client */;
861 /*!50001 SET @saved_cs_results = @@character_set_results */;
862@@ -3552,6 +3618,7 @@ drop table t1;
863 mysqldump {
864 mariadb-dump: Got error: 1356: "View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them" when using LOCK TABLES
865 mariadb-dump: Couldn't execute 'SHOW FIELDS FROM `v1`': View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them (1356)
866+/*!999999\- enable the sandbox mode */
867
868 -- failed on view `v1`: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`t1`.`id` AS `id` from `t1`
869
870@@ -3568,6 +3635,7 @@ insert into t1 values (1232131);
871 insert into t1 values (4711);
872 insert into t1 values (3231);
873 insert into t1 values (0815);
874+/*!999999\- enable the sandbox mode */
875
876 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
877 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
878@@ -3646,6 +3714,7 @@ create table basetable ( id serial, tag varchar(64) );
879 create database mysqldump_views;
880 use mysqldump_views;
881 create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_tables.basetable;
882+/*!999999\- enable the sandbox mode */
883
884 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
885
886@@ -3730,10 +3799,14 @@ create user mysqltest_1@localhost;
887 create table t1(a int, b varchar(34));
888 reset master;
889 mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
890+/*!999999\- enable the sandbox mode */
891 mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
892+/*!999999\- enable the sandbox mode */
893 grant RELOAD on *.* to mysqltest_1@localhost;
894 mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
895+/*!999999\- enable the sandbox mode */
896 mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
897+/*!999999\- enable the sandbox mode */
898 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
899 drop table t1;
900 drop user mysqltest_1@localhost;
901@@ -3792,6 +3865,7 @@ use test;
902 #
903 # Bug #33762: mysqldump can not dump INFORMATION_SCHEMA
904 #
905+/*!999999\- enable the sandbox mode */
906 DROP TABLE IF EXISTS `TABLES`;
907 /*!40101 SET @saved_cs_client = @@character_set_client */;
908 /*!40101 SET character_set_client = utf8 */;
909@@ -3856,6 +3930,7 @@ DROP TABLE t1;
910 CREATE TABLE t2 (a INT) ENGINE=MyISAM;
911 CREATE TABLE t3 (a INT) ENGINE=MyISAM;
912 CREATE TABLE t1 (a INT) ENGINE=merge UNION=(t2, t3);
913+/*!999999\- enable the sandbox mode */
914
915 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
916 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
917@@ -3946,10 +4021,12 @@ connect user27293,localhost,user1,,mysqldump_test_db,$MASTER_MYPORT,$MASTER_MYS
918 connection user27293;
919 create procedure mysqldump_test_db.sp1() select 'hello';
920 mariadb-dump: user2 has insufficient privileges to SHOW CREATE PROCEDURE `sp1`!
921+/*!999999\- enable the sandbox mode */
922
923 -- insufficient privileges to SHOW CREATE PROCEDURE `sp1`
924 -- does user2 have permissions on mysql.proc?
925
926+/*!999999\- enable the sandbox mode */
927 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
928 /*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
929 /*!50003 SET @saved_cs_client = @@character_set_client */ ;
930@@ -3977,6 +4054,7 @@ drop database mysqldump_test_db;
931 #
932 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
933 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
934+/*!999999\- enable the sandbox mode */
935 /*!40101 SET @saved_cs_client = @@character_set_client */;
936 /*!40101 SET character_set_client = utf8 */;
937 CREATE TABLE `t1` (
938@@ -4050,6 +4128,7 @@ use db42635;
939 create table t1 (id int);
940 create view db42635.v1 (c) as select * from db42635.t1;
941 create view db42635.v2 (c) as select * from db42635.t1;
942+/*!999999\- enable the sandbox mode */
943
944 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
945 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
946@@ -4110,6 +4189,7 @@ drop database db42635;
947 #
948 SET NAMES utf8;
949 CREATE TABLE `straße` ( f1 INT );
950+/*!999999\- enable the sandbox mode */
951 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
952 /*!40103 SET TIME_ZONE='+00:00' */;
953 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
954@@ -4132,6 +4212,7 @@ UNLOCK TABLES;
955 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
956 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
957
958+/*!999999\- enable the sandbox mode */
959 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
960 /*!40103 SET TIME_ZONE='+00:00' */;
961 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
962@@ -4156,6 +4237,7 @@ UNLOCK TABLES;
963
964 DROP TABLE `straße`;
965 CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
966+/*!999999\- enable the sandbox mode */
967 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
968 /*!40103 SET TIME_ZONE='+00:00' */;
969 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
970@@ -4179,6 +4261,7 @@ UNLOCK TABLES;
971 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
972
973 mariadb-dump: Got error: 1146: "Table 'test.???????????????????????' doesn't exist" when using LOCK TABLES
974+/*!999999\- enable the sandbox mode */
975 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
976 /*!40103 SET TIME_ZONE='+00:00' */;
977 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
978@@ -4195,6 +4278,7 @@ CREATE TABLE t1(a int, b int);
979 INSERT INTO t1 VALUES (1,1);
980 INSERT INTO t1 VALUES (2,3);
981 INSERT INTO t1 VALUES (3,4), (4,5);
982+/*!999999\- enable the sandbox mode */
983
984 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
985 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
986@@ -4469,6 +4553,7 @@ insert into t1 values (1232131);
987 insert into t1 values (4711);
988 insert into t1 values (3231);
989 insert into t1 values (0815);
990+/*!999999\- enable the sandbox mode */
991
992 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
993 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
994@@ -4601,6 +4686,7 @@ CREATE DATABASE test;
995 create database `test-database`;
996 use `test-database`;
997 create table test (a int);
998+/*!999999\- enable the sandbox mode */
999 DROP TABLE IF EXISTS `test`;
1000 /*!40101 SET @saved_cs_client = @@character_set_client */;
1001 /*!40101 SET character_set_client = utf8 */;
1002@@ -4823,6 +4909,7 @@ CREATE TRIGGER `trig` BEFORE INSERT ON `test` FOR EACH ROW BEGIN
1003 END |
1004 ALTER DATABASE `test-database` CHARACTER SET latin1 COLLATE latin1_swedish_ci;
1005 ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
1006+/*!999999\- enable the sandbox mode */
1007 /*!40101 SET @saved_cs_client = @@character_set_client */;
1008 /*!40101 SET character_set_client = utf8 */;
1009 CREATE TABLE `test` (
1010@@ -5306,6 +5393,7 @@ USE test;
1011 # Also verify that a prefix of the mode's name is enough.
1012 #
1013 CREATE TABLE t1 (a INT);
1014+/*!999999\- enable the sandbox mode */
1015 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
1016 /*!40103 SET TIME_ZONE='+00:00' */;
1017 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
1018@@ -5538,6 +5626,7 @@ CREATE DATABASE `a\"'``b`;
1019 USE `a\"'``b`;
1020 CREATE PROCEDURE p1() BEGIN END;
1021 ALTER DATABASE `a\"'``b` COLLATE utf8_general_ci;
1022+/*!999999\- enable the sandbox mode */
1023 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1024 /*!50003 SET sql_mode = '' */ ;
1025 ALTER DATABASE `a\"'``b` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
1026@@ -5586,6 +5675,7 @@ CREATE VIEW nonunique_table_view_name AS SELECT 1;
1027
1028 ##################################################
1029 # --compact --databases db1 db2
1030+/*!999999\- enable the sandbox mode */
1031
1032 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
1033
1034@@ -5654,6 +5744,7 @@ USE `db2`;
1035 ##################################################
1036 # --compact db2
1037
1038+/*!999999\- enable the sandbox mode */
1039 /*!40101 SET @saved_cs_client = @@character_set_client */;
1040 /*!40101 SET character_set_client = utf8 */;
1041 CREATE TABLE `nonunique_table_name` (
1042@@ -5676,6 +5767,7 @@ INSERT INTO `nonunique_table_view_name` VALUES
1043
1044 ##################################################
1045 # --compact --delayed-insert --no-data-med=0 --databases db2 db1
1046+/*!999999\- enable the sandbox mode */
1047
1048 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
1049
1050@@ -5807,6 +5899,7 @@ CREATE TABLE t1 (a int, b int);
1051 CREATE TRIGGER tt1_t1 BEFORE INSERT ON t1 FOR EACH ROW
1052 SET NEW.b=NEW.a + 10;
1053 INSERT INTO t1 (a) VALUES (1),(2),(3);
1054+/*!999999\- enable the sandbox mode */
1055
1056 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1057 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1058@@ -5855,6 +5948,7 @@ DROP TABLE t1;
1059 #
1060 # Without --replace and --insert-ignore
1061 #
1062+/*!999999\- enable the sandbox mode */
1063
1064 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1065 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1066@@ -5950,6 +6044,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
1067 #
1068 # With --replace
1069 #
1070+/*!999999\- enable the sandbox mode */
1071
1072 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1073 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1074@@ -6055,6 +6150,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
1075 #
1076 # With --insert-ignore
1077 #
1078+/*!999999\- enable the sandbox mode */
1079
1080 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1081 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1082@@ -6179,6 +6275,7 @@ insert into t3 values(2);
1083 insert into t3(`invisible`, `a b c & $!@#$%^&*( )`, `ds=~!@ \# $% ^ & * ( ) _ - = +` ) values(1,2,3);
1084 CREATE TABLE t4(ËÃÃŒÃÎËÃ1 INT);
1085 insert into t4 values(1);
1086+/*!999999\- enable the sandbox mode */
1087 /*!40101 SET @saved_cs_client = @@character_set_client */;
1088 /*!40101 SET character_set_client = utf8 */;
1089 CREATE TABLE `t1` (
1090@@ -6219,6 +6316,7 @@ CREATE TABLE `t4` (
1091 INSERT INTO `t4` VALUES
1092 (1);
1093 #Check side effect on --complete insert
1094+/*!999999\- enable the sandbox mode */
1095 /*!40101 SET @saved_cs_client = @@character_set_client */;
1096 /*!40101 SET character_set_client = utf8 */;
1097 CREATE TABLE `t1` (
1098@@ -6464,7 +6562,7 @@ j integer
1099 INSERT INTO t VALUES (1,1),(2,2),(3,3),(4,4);
1100 # Dump database 1
1101 # Restore from database 1 to database 2
1102-ERROR 1100 (HY000) at line 45: Table 'seq_t_i' was not locked with LOCK TABLES
1103+ERROR 1100 (HY000) at line 46: Table 'seq_t_i' was not locked with LOCK TABLES
1104 SETVAL(`seq_t_i`, 1, 0)
1105 1
1106 DROP DATABASE IF EXISTS test1;
1107@@ -6585,3 +6683,17 @@ SET GLOBAL LOG_OUTPUT=DEFAULT, GLOBAL GENERAL_LOG=@save_general_log;
1108 TRUNCATE TABLE mysql.general_log;
1109 DROP DATABASE test1;
1110 # End of 10.3 tests
1111+# MDEV-33727 mariadb-dump trusts the server and does not validate the data
1112+#
1113+create table t1 (a int);
1114+/*!999999\- enable the sandbox mode */
1115+DROP TABLE IF EXISTS `t1`;
1116+/*!40101 SET @saved_cs_client = @@character_set_client */;
1117+/*!40101 SET character_set_client = utf8 */;
1118+CREATE TABLE `t1` (
1119+`a` int(11) DEFAULT NULL
1120+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
1121+/*!40101 SET character_set_client = @saved_cs_client */;
1122+ERROR at line 9: Not allowed in the sandbox mode
1123+drop table t1;
1124+# End of 10.5 tests
1125diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test
1126index 7dc3cfe8..9248f2ac 100644
1127--- a/mysql-test/main/mysqldump.test
1128+++ b/mysql-test/main/mysqldump.test
1129@@ -2983,3 +2983,24 @@ DROP DATABASE test1;
1130 --remove_file $MYSQLTEST_VARDIR/tmp/dumptest1.sql
1131
1132 --echo # End of 10.3 tests
1133+
1134+--echo #
1135+--echo # MDEV-33727 mariadb-dump trusts the server and does not validate the data
1136+--echo #
1137+
1138+create table t1 (a int);
1139+--exec $MYSQL_DUMP --compact --add-drop-table test > $MYSQLTEST_VARDIR/tmp/mdev33727.sql
1140+
1141+# first let's verify it can be loaded not only by mariadb client
1142+--source $MYSQLTEST_VARDIR/tmp/mdev33727.sql
1143+
1144+# and now test the mariadb client sandbox protection
1145+--append_file $MYSQLTEST_VARDIR/tmp/mdev33727.sql
1146+\! echo foo
1147+EOF
1148+--error 1
1149+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mdev33727.sql 2>&1
1150+--remove_file $MYSQLTEST_VARDIR/tmp/mdev33727.sql
1151+drop table t1;
1152+
1153+--echo # End of 10.5 tests
1154diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result
1155index a5ac8956..18294d16 100644
1156--- a/mysql-test/main/openssl_1.result
1157+++ b/mysql-test/main/openssl_1.result
1158@@ -77,6 +77,7 @@ DROP TABLE thread_status;
1159 SET GLOBAL event_scheduler=0;
1160 CREATE TABLE t1(a int);
1161 INSERT INTO t1 VALUES (1), (2);
1162+/*!999999\- enable the sandbox mode */
1163
1164 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1165 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1166@@ -113,6 +114,7 @@ UNLOCK TABLES;
1167 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
1168 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
1169
1170+/*!999999\- enable the sandbox mode */
1171
1172 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1173 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1174@@ -149,6 +151,7 @@ UNLOCK TABLES;
1175 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
1176 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
1177
1178+/*!999999\- enable the sandbox mode */
1179
1180 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1181 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1182@@ -202,4 +205,4 @@ End of 5.1 tests
1183 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
1184 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1185 DELIMITER /*!*/;
1186-ERROR: Failed on connect: TLS/SSL error
1187\ No newline at end of file
1188+ERROR: Failed on connect: TLS/SSL error
1189diff --git a/mysql-test/main/plugin_auth.result b/mysql-test/main/plugin_auth.result
1190index ac10bd06..f8128355 100644
1191--- a/mysql-test/main/plugin_auth.result
1192+++ b/mysql-test/main/plugin_auth.result
1193@@ -338,6 +338,7 @@ FLUSH PRIVILEGES;
1194 # Executing 'mysqladmin'
1195 mysqld is alive
1196 # Executing 'mysqldump'
1197+/*!999999\- enable the sandbox mode */
1198 # Executing 'mysql_upgrade'
1199 #
1200 # Bug #59657: Move the client authentication_pam plugin into the
1201diff --git a/mysql-test/main/rpl_mysqldump_slave.result b/mysql-test/main/rpl_mysqldump_slave.result
1202index 903b6711..6c28862b 100644
1203--- a/mysql-test/main/rpl_mysqldump_slave.result
1204+++ b/mysql-test/main/rpl_mysqldump_slave.result
1205@@ -7,12 +7,15 @@ connection slave;
1206 connection master;
1207 use test;
1208 connection slave;
1209+/*!999999\- enable the sandbox mode */
1210 -- SET GLOBAL gtid_slave_pos='';
1211 CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1212+/*!999999\- enable the sandbox mode */
1213 STOP ALL SLAVES;
1214 -- SET GLOBAL gtid_slave_pos='';
1215 CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1216 START ALL SLAVES;
1217+/*!999999\- enable the sandbox mode */
1218 STOP ALL SLAVES;
1219 -- SET GLOBAL gtid_slave_pos='';
1220 CHANGE MASTER '' TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1221@@ -20,6 +23,7 @@ START ALL SLAVES;
1222 start slave;
1223 Warnings:
1224 Note 1254 Slave is already running
1225+/*!999999\- enable the sandbox mode */
1226 -- SET GLOBAL gtid_slave_pos='';
1227 CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1228 start slave;
1229@@ -37,12 +41,14 @@ DROP TABLE t2;
1230
1231 1. --dump-slave=1
1232
1233+/*!999999\- enable the sandbox mode */
1234 SET GLOBAL gtid_slave_pos='0-1-1001';
1235 CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
1236 -- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1237
1238 2. --dump-slave=2
1239
1240+/*!999999\- enable the sandbox mode */
1241 -- SET GLOBAL gtid_slave_pos='0-1-1001';
1242 -- CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
1243 -- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1244@@ -50,18 +56,21 @@ CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
1245
1246 1. --master-data=1
1247
1248+/*!999999\- enable the sandbox mode */
1249 -- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
1250 CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
1251 SET GLOBAL gtid_slave_pos='0-2-1003';
1252
1253 2. --master-data=2
1254
1255+/*!999999\- enable the sandbox mode */
1256 -- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
1257 -- CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
1258 -- SET GLOBAL gtid_slave_pos='0-2-1003';
1259
1260 3. --master-data --single-transaction
1261
1262+/*!999999\- enable the sandbox mode */
1263 -- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
1264 CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
1265 SET GLOBAL gtid_slave_pos='0-2-1003';
1266diff --git a/mysql-test/main/trigger_wl3253.result b/mysql-test/main/trigger_wl3253.result
1267index ed08b336..6d77ed5e 100644
1268--- a/mysql-test/main/trigger_wl3253.result
1269+++ b/mysql-test/main/trigger_wl3253.result
1270@@ -310,6 +310,7 @@ CREATE TABLE t1 (a INT);
1271 CREATE TRIGGER tr1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1;
1272 CREATE TRIGGER tr2_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=2;
1273 CREATE TRIGGER tr1_bu BEFORE UPDATE ON t1 FOR EACH ROW SET @a:=3;
1274+/*!999999\- enable the sandbox mode */
1275 /*!40101 SET @saved_cs_client = @@character_set_client */;
1276 /*!40101 SET character_set_client = utf8 */;
1277 CREATE TABLE `t1` (
1278@@ -372,6 +373,7 @@ CREATE TRIGGER tr2_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=2;
1279 CREATE TRIGGER tr0_bi BEFORE INSERT ON t1 FOR EACH ROW PRECEDES tr1_bi SET @a:=0;
1280 CREATE TRIGGER tr1_1_bi BEFORE INSERT ON t1 FOR EACH ROW FOLLOWS tr1_bi SET @a:=0;
1281 # Expected order of triggers in the dump is: tr0_bi, tr1_bi, tr1_1_bi, tr2_i.
1282+/*!999999\- enable the sandbox mode */
1283 /*!40101 SET @saved_cs_client = @@character_set_client */;
1284 /*!40101 SET character_set_client = utf8 */;
1285 CREATE TABLE `t1` (
1286diff --git a/mysql-test/suite/archive/archive_bitfield.result b/mysql-test/suite/archive/archive_bitfield.result
1287index 8c30a5f8..5cda525e 100644
1288--- a/mysql-test/suite/archive/archive_bitfield.result
1289+++ b/mysql-test/suite/archive/archive_bitfield.result
1290@@ -180,6 +180,7 @@ INSERT INTO `t1` VALUES
1291 (NULL,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'100000',b'010010',b'011111',4,5,5,5,5,5,5,5,5,5,3,2,1),
1292 (NULL,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000000',b'001100',b'111111',4,5,5,5,5,5,5,5,5,5,3,2,1),
1293 (NULL,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'111111',b'000000',b'000000',4,5,5,5,5,5,5,5,5,5,3,2,1);
1294+/*!999999\- enable the sandbox mode */
1295 INSERT INTO `t1` VALUES (1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x01,0x3F,0x3E,4,5,5,5,5,5,5,5,5,5,3,2,1);
1296 INSERT INTO `t1` VALUES (2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x02,0x00,0x3D,4,5,5,5,5,5,5,5,5,5,3,2,1);
1297 INSERT INTO `t1` VALUES (3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x04,0x0F,0x3B,4,5,5,5,5,5,5,5,5,5,3,2,1);
1298diff --git a/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result b/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
1299index 24211c63..8084bd44 100644
1300--- a/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
1301+++ b/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
1302@@ -34,6 +34,7 @@ PROCEDURE p1;
1303 FUNCTION f1 RETURN INT;
1304 END;
1305 $$
1306+/*!999999\- enable the sandbox mode */
1307
1308 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1309 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1310diff --git a/mysql-test/suite/federated/federatedx.result b/mysql-test/suite/federated/federatedx.result
1311index 49deff81..333b3ca8 100644
1312--- a/mysql-test/suite/federated/federatedx.result
1313+++ b/mysql-test/suite/federated/federatedx.result
1314@@ -2243,6 +2243,7 @@ connection master;
1315 CREATE TABLE t1(id VARCHAR(20) NOT NULL, PRIMARY KEY(id)) ENGINE=FEDERATED
1316 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';
1317 # Dump table t1 using mysqldump tool
1318+/*!999999\- enable the sandbox mode */
1319 /*!40101 SET @saved_cs_client = @@character_set_client */;
1320 /*!40101 SET character_set_client = utf8 */;
1321 CREATE TABLE `t1` (
1322diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result
1323index 8b5e36d8..a321ad9a 100644
1324--- a/mysql-test/suite/roles/definer.result
1325+++ b/mysql-test/suite/roles/definer.result
1326@@ -274,6 +274,7 @@ a b c
1327 111 4 0
1328 2 20 200
1329 delete from t1 where a=111;
1330+/*!999999\- enable the sandbox mode */
1331
1332 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
1333
1334diff --git a/mysql-test/suite/sql_sequence/mysqldump.result b/mysql-test/suite/sql_sequence/mysqldump.result
1335index 0199bb71..c2f8dea9 100644
1336--- a/mysql-test/suite/sql_sequence/mysqldump.result
1337+++ b/mysql-test/suite/sql_sequence/mysqldump.result
1338@@ -3,6 +3,7 @@ CREATE TABLE t1(a INT, KEY (a)) KEY_BLOCK_SIZE=1024;
1339 insert into t1 values (1),(2);
1340 CREATE SEQUENCE x1 engine=innodb;
1341 # dump whole database
1342+/*!999999\- enable the sandbox mode */
1343 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1344 SELECT SETVAL(`a1`, 1, 0);
1345 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1346@@ -18,6 +19,7 @@ INSERT INTO `t1` VALUES
1347 (1),
1348 (2);
1349 # dump by tables order 1
1350+/*!999999\- enable the sandbox mode */
1351 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1352 SELECT SETVAL(`a1`, 1, 0);
1353 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1354@@ -33,6 +35,7 @@ INSERT INTO `t1` VALUES
1355 (1),
1356 (2);
1357 # dump by tables order 2
1358+/*!999999\- enable the sandbox mode */
1359 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1360 SELECT SETVAL(`a1`, 1, 0);
1361 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1362@@ -48,6 +51,7 @@ INSERT INTO `t1` VALUES
1363 (1),
1364 (2);
1365 # dump by tables only tables
1366+/*!999999\- enable the sandbox mode */
1367 /*!40101 SET @saved_cs_client = @@character_set_client */;
1368 /*!40101 SET character_set_client = utf8 */;
1369 CREATE TABLE `t1` (
1370@@ -59,6 +63,7 @@ INSERT INTO `t1` VALUES
1371 (1),
1372 (2);
1373 # dump by tables only sequences
1374+/*!999999\- enable the sandbox mode */
1375 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1376 SELECT SETVAL(`a1`, 1, 0);
1377 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1378diff --git a/storage/connect/mysql-test/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result
1379index d3c244b2..e91d17f7 100644
1380--- a/storage/connect/mysql-test/connect/r/mysql.result
1381+++ b/storage/connect/mysql-test/connect/r/mysql.result
1382@@ -229,6 +229,7 @@ a
1383 20
1384 30
1385 # Start of mysqldump ------
1386+/*!999999\- enable the sandbox mode */
1387 /*!40101 SET @saved_cs_client = @@character_set_client */;
1388 /*!40101 SET character_set_client = utf8 */;
1389 CREATE TABLE `t2` (
1390--
13912.40.0
1392
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0002.patch b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0002.patch
new file mode 100644
index 0000000000..58815b9db9
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0002.patch
@@ -0,0 +1,38 @@
1From 1c425a8d854061d1987ad4ea352c7270652e31c4 Mon Sep 17 00:00:00 2001
2From: Sergei Golubchik <serg@mariadb.org>
3Date: Wed, 8 May 2024 10:31:28 +0200
4Subject: [PATCH] MDEV-33727 update test results
5
6followup for 13663cb5c455
7
8CVE: CVE-2024-21096
9Upstream-status: Backport [https://github.com/MariaDB/server/commit/1c425a8d854061d1987ad4ea352c7270652e31c4]
10
11Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
12---
13 mysql-test/suite/s3/mysqldump.result | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/mysql-test/suite/s3/mysqldump.result b/mysql-test/suite/s3/mysqldump.result
17index 3f4c2081..e0c0caf6 100644
18--- a/mysql-test/suite/s3/mysqldump.result
19+++ b/mysql-test/suite/s3/mysqldump.result
20@@ -4,6 +4,7 @@ alter table t1 engine=S3;
21 #####
22 # mysqldump with --copy-s3-tables=0 (by default)
23 ###
24+/*!999999\- enable the sandbox mode */
25 #####
26 # mysqldump with --copy-s3-tables=0 (by default) XML
27 ###
28@@ -15,6 +16,7 @@ alter table t1 engine=S3;
29 #####
30 # mysqldump with --copy-s3-tables=1
31 ###
32+/*!999999\- enable the sandbox mode */
33 /*!40101 SET @saved_cs_client = @@character_set_client */;
34 /*!40101 SET character_set_client = utf8 */;
35 CREATE TABLE `t1` (
36--
372.40.0
38
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0003.patch b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0003.patch
new file mode 100644
index 0000000000..5573ccfdb9
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0003.patch
@@ -0,0 +1,138 @@
1From 77c4c0f256f3c268d3f72625b04240d24a70513c Mon Sep 17 00:00:00 2001
2From: Oleksandr Byelkin <sanja@mariadb.com>
3Date: Fri, 7 Jun 2024 12:13:21 +0200
4Subject: [PATCH] MDEV-34203 Sandbox mode \- is not compatible with
5 --binary-mode
6
7"Process" sandbox short command put by masqldump to avoid an error.
8
9CVE: CVE-2024-21096
10Upstream-Status: Backport [https://github.com/MariaDB/server/commit/77c4c0f256f3c268d3f72625b04240d24a70513c]
11
12Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
13---
14 client/mysql.cc | 30 +++++++++++++++++++++++++-----
15 mysql-test/main/mysql.result | 11 +++++++++++
16 mysql-test/main/mysql.test | 16 ++++++++++++++++
17 3 files changed, 52 insertions(+), 5 deletions(-)
18
19diff --git a/client/mysql.cc b/client/mysql.cc
20index 10f25966..0bb56510 100644
21--- a/client/mysql.cc
22+++ b/client/mysql.cc
23@@ -1112,6 +1112,8 @@ inline int get_command_index(char cmd_char)
24
25 static int delimiter_index= -1;
26 static int charset_index= -1;
27+static int sandbox_index= -1;
28+
29 static bool real_binary_mode= FALSE;
30
31
32@@ -1122,7 +1124,8 @@ int main(int argc,char *argv[])
33 MY_INIT(argv[0]);
34 DBUG_ENTER("main");
35 DBUG_PROCESS(argv[0]);
36-
37+
38+ sandbox_index= get_command_index('-');
39 charset_index= get_command_index('C');
40 delimiter_index= get_command_index('d');
41 delimiter_str= delimiter;
42@@ -2237,8 +2240,9 @@ static int read_and_execute(bool interactive)
43
44 /**
45 It checks if the input is a short form command. It returns the command's
46- pointer if a command is found, else return NULL. Note that if binary-mode
47- is set, then only \C is searched for.
48+ pointer if a command is found, else return NULL.
49+
50+ Note that if binary-mode is set, then only \C and \- are searched for.
51
52 @param cmd_char A character of one byte.
53
54@@ -2253,13 +2257,23 @@ static COMMANDS *find_command(char cmd_char)
55 int index= -1;
56
57 /*
58- In binary-mode, we disallow all mysql commands except '\C'
59- and DELIMITER.
60+ In binary-mode, we disallow all client commands except '\C'
61+ DELIMITER (see long comand finding find_command(char *))
62+ and '\-' (sandbox, see following comment).
63 */
64 if (real_binary_mode)
65 {
66 if (cmd_char == 'C')
67 index= charset_index;
68+ /*
69+ binary-mode enforces stricter controls compared to sandbox mode.
70+ Whether sandbox mode is enabled or not is irrelevant when
71+ binary-mode is active.
72+ The only purpose of processing sandbox mode here is to avoid error
73+ messages on files made by mysqldump.
74+ */
75+ else if (cmd_char == '-')
76+ index= sandbox_index;
77 }
78 else
79 index= get_command_index(cmd_char);
80@@ -2315,6 +2329,12 @@ static COMMANDS *find_command(char *name)
81 len= (uint) strlen(name);
82
83 int index= -1;
84+ /*
85+ In binary-mode, we disallow all client commands except DELIMITER
86+ and short commands '\C' and '\-' (see short command finding
87+ find_command(char)).
88+ */
89+
90 if (real_binary_mode)
91 {
92 if (is_delimiter_command(name, len))
93diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result
94index c2e42fda..b983f009 100644
95--- a/mysql-test/main/mysql.result
96+++ b/mysql-test/main/mysql.result
97@@ -639,3 +639,14 @@ drop table t1;
98 WARNING: option '--enable-cleartext-plugin' is obsolete.
99 1
100 1
101+#
102+# MDEV-34203: Sandbox mode \- is not compatible with --binary-mode
103+#
104+create table t1 (a int);
105+drop table t1;
106+show create table t1;
107+Table Create Table
108+t1 CREATE TABLE `t1` (
109+ `a` int(11) DEFAULT NULL
110+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
111+drop table t1;
112diff --git a/mysql-test/main/mysql.test b/mysql-test/main/mysql.test
113index 0f41add8..553398fd 100644
114--- a/mysql-test/main/mysql.test
115+++ b/mysql-test/main/mysql.test
116@@ -716,3 +716,19 @@ drop table t1;
117 #
118 --echo
119 --exec $MYSQL test --enable-cleartext-plugin -e "select 1"
120+
121+--echo #
122+--echo # MDEV-34203: Sandbox mode \- is not compatible with --binary-mode
123+--echo #
124+
125+create table t1 (a int);
126+
127+--exec $MYSQL_DUMP test t1 > $MYSQLTEST_VARDIR/tmp/MDEV-34203.sql
128+
129+drop table t1;
130+
131+--exec $MYSQL --binary-mode test 2>&1 < $MYSQLTEST_VARDIR/tmp/MDEV-34203.sql
132+
133+show create table t1;
134+drop table t1;
135+--remove_file $MYSQLTEST_VARDIR/tmp/MDEV-34203.sql
136--
1372.40.0
138
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0004.patch b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0004.patch
new file mode 100644
index 0000000000..5444c39802
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0004.patch
@@ -0,0 +1,7729 @@
1From d60f5c11ea9008fa57444327526e3d2c8633ba06 Mon Sep 17 00:00:00 2001
2From: Sergei Golubchik <serg@mariadb.org>
3Date: Fri, 14 Jun 2024 17:32:52 +0200
4Subject: [PATCH] MDEV-34318 mariadb-dump SQL syntax error with
5 MAX_STATEMENT_TIME against Percona MySQL server
6
7protect MariaDB conditional comments from a bug
8in Percona MySQL comment parser
9
10CVE: CVE-2024-21096
11Upstream-Status: Backport [https://github.com/MariaDB/server/commit/d60f5c11ea9008fa57444327526e3d2c8633ba06]
12
13Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
14---
15 client/mysqldump.c | 4 +-
16 mysql-test/main/column_compression.result | 288 ++++----
17 .../main/column_compression_parts.result | 14 +-
18 .../main/mysqlbinlog_row_compressed.result | 26 +-
19 .../main/mysqlbinlog_row_minimal.result | 34 +-
20 .../main/mysqlbinlog_stmt_compressed.result | 26 +-
21 .../binlog/r/binlog_mysqlbinlog_row.result | 666 +++++++++---------
22 .../r/binlog_mysqlbinlog_row_innodb.result | 76 +-
23 .../r/binlog_mysqlbinlog_row_myisam.result | 76 +-
24 .../r/binlog_mysqlbinlog_row_trans.result | 38 +-
25 .../suite/binlog/r/binlog_row_annotate.result | 144 ++--
26 .../binlog/r/binlog_row_ctype_ucs.result | 22 +-
27 .../r/binlog_row_mysqlbinlog_options.result | 52 +-
28 .../binlog/r/binlog_stm_ctype_ucs.result | 22 +-
29 mysql-test/suite/binlog/r/flashback.result | 18 +-
30 .../binlog_row_annotate.result | 72 +-
31 .../compat/oracle/r/column_compression.result | 250 +++----
32 .../rpl/r/rpl_blackhole_row_annotate.result | 44 +-
33 sql/field.h | 4 +-
34 sql/log_event_client.cc | 8 +-
35 20 files changed, 942 insertions(+), 942 deletions(-)
36
37diff --git a/client/mysqldump.c b/client/mysqldump.c
38index 51a5af15..9502227a 100644
39--- a/client/mysqldump.c
40+++ b/client/mysqldump.c
41@@ -7039,11 +7039,11 @@ int main(int argc, char **argv)
42 write_header(md_result_file, *argv);
43
44 /* Set MAX_STATEMENT_TIME to 0 unless set in client */
45- my_snprintf(query, sizeof(query), "/*!100100 SET @@MAX_STATEMENT_TIME=%f */", opt_max_statement_time);
46+ my_snprintf(query, sizeof(query), "/*M!100100 SET @@MAX_STATEMENT_TIME=%f */", opt_max_statement_time);
47 mysql_query(mysql, query);
48
49 /* Set server side timeout between client commands to server compiled-in default */
50- mysql_query(mysql, "/*!100100 SET WAIT_TIMEOUT=DEFAULT */");
51+ mysql_query(mysql, "/*M!100100 SET WAIT_TIMEOUT=DEFAULT */");
52
53 /* Check if the server support multi source */
54 if (mysql_get_server_version(mysql) >= 100000)
55diff --git a/mysql-test/main/column_compression.result b/mysql-test/main/column_compression.result
56index 6e9722a6..bc9256f1 100644
57--- a/mysql-test/main/column_compression.result
58+++ b/mysql-test/main/column_compression.result
59@@ -8,7 +8,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification
60 SHOW CREATE TABLE t1;
61 Table Create Table
62 t1 CREATE TABLE `t1` (
63- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
64+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
65 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
66 # Make sure column was actually compressed
67 INSERT INTO t1 VALUES(REPEAT('a', 1000));
68@@ -44,7 +44,7 @@ ALTER TABLE t1 MODIFY COLUMN a BLOB COMPRESSED;
69 SHOW CREATE TABLE t1;
70 Table Create Table
71 t1 CREATE TABLE `t1` (
72- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
73+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
74 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
75 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
76 LEFT(a, 10) LENGTH(a)
77@@ -61,7 +61,7 @@ CREATE TABLE t2 LIKE t1;
78 SHOW CREATE TABLE t2;
79 Table Create Table
80 t2 CREATE TABLE `t2` (
81- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
82+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
83 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
84 DROP TABLE t2;
85 # Make sure implicit CREATE TABLE ... SELECT inherits compression
86@@ -69,7 +69,7 @@ CREATE TABLE t2 SELECT * FROM t1;
87 SHOW CREATE TABLE t2;
88 Table Create Table
89 t2 CREATE TABLE `t2` (
90- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
91+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
92 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
93 SELECT LEFT(a, 10), LENGTH(a) FROM t2;
94 LEFT(a, 10) LENGTH(a)
95@@ -105,7 +105,7 @@ ALTER TABLE t1 ENGINE=InnoDB;
96 SHOW CREATE TABLE t1;
97 Table Create Table
98 t1 CREATE TABLE `t1` (
99- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
100+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
101 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
102 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
103 LEFT(a, 10) LENGTH(a)
104@@ -223,7 +223,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification
105 SHOW CREATE TABLE t1;
106 Table Create Table
107 t1 CREATE TABLE `t1` (
108- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
109+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
110 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
111 # Make sure column was actually compressed
112 INSERT INTO t1 VALUES(REPEAT('a', 1000));
113@@ -259,7 +259,7 @@ ALTER TABLE t1 MODIFY COLUMN a TEXT COMPRESSED;
114 SHOW CREATE TABLE t1;
115 Table Create Table
116 t1 CREATE TABLE `t1` (
117- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
118+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
119 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
120 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
121 LEFT(a, 10) LENGTH(a)
122@@ -276,7 +276,7 @@ CREATE TABLE t2 LIKE t1;
123 SHOW CREATE TABLE t2;
124 Table Create Table
125 t2 CREATE TABLE `t2` (
126- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
127+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
128 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
129 DROP TABLE t2;
130 # Make sure implicit CREATE TABLE ... SELECT inherits compression
131@@ -284,7 +284,7 @@ CREATE TABLE t2 SELECT * FROM t1;
132 SHOW CREATE TABLE t2;
133 Table Create Table
134 t2 CREATE TABLE `t2` (
135- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
136+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
137 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
138 SELECT LEFT(a, 10), LENGTH(a) FROM t2;
139 LEFT(a, 10) LENGTH(a)
140@@ -320,7 +320,7 @@ ALTER TABLE t1 ENGINE=InnoDB;
141 SHOW CREATE TABLE t1;
142 Table Create Table
143 t1 CREATE TABLE `t1` (
144- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
145+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
146 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
147 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
148 LEFT(a, 10) LENGTH(a)
149@@ -438,7 +438,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification
150 SHOW CREATE TABLE t1;
151 Table Create Table
152 t1 CREATE TABLE `t1` (
153- `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
154+ `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
155 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
156 # Make sure column was actually compressed
157 INSERT INTO t1 VALUES(REPEAT('a', 1000));
158@@ -474,7 +474,7 @@ ALTER TABLE t1 MODIFY COLUMN a VARBINARY(10000) COMPRESSED;
159 SHOW CREATE TABLE t1;
160 Table Create Table
161 t1 CREATE TABLE `t1` (
162- `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
163+ `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
164 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
165 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
166 LEFT(a, 10) LENGTH(a)
167@@ -491,7 +491,7 @@ CREATE TABLE t2 LIKE t1;
168 SHOW CREATE TABLE t2;
169 Table Create Table
170 t2 CREATE TABLE `t2` (
171- `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
172+ `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
173 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
174 DROP TABLE t2;
175 # Make sure implicit CREATE TABLE ... SELECT inherits compression
176@@ -499,7 +499,7 @@ CREATE TABLE t2 SELECT * FROM t1;
177 SHOW CREATE TABLE t2;
178 Table Create Table
179 t2 CREATE TABLE `t2` (
180- `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
181+ `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
182 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
183 SELECT LEFT(a, 10), LENGTH(a) FROM t2;
184 LEFT(a, 10) LENGTH(a)
185@@ -535,7 +535,7 @@ ALTER TABLE t1 ENGINE=InnoDB;
186 SHOW CREATE TABLE t1;
187 Table Create Table
188 t1 CREATE TABLE `t1` (
189- `a` varbinary(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
190+ `a` varbinary(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
191 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
192 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
193 LEFT(a, 10) LENGTH(a)
194@@ -653,7 +653,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification
195 SHOW CREATE TABLE t1;
196 Table Create Table
197 t1 CREATE TABLE `t1` (
198- `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
199+ `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
200 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
201 # Make sure column was actually compressed
202 INSERT INTO t1 VALUES(REPEAT('a', 1000));
203@@ -689,7 +689,7 @@ ALTER TABLE t1 MODIFY COLUMN a VARCHAR(10000) COMPRESSED;
204 SHOW CREATE TABLE t1;
205 Table Create Table
206 t1 CREATE TABLE `t1` (
207- `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
208+ `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
209 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
210 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
211 LEFT(a, 10) LENGTH(a)
212@@ -706,7 +706,7 @@ CREATE TABLE t2 LIKE t1;
213 SHOW CREATE TABLE t2;
214 Table Create Table
215 t2 CREATE TABLE `t2` (
216- `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
217+ `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
218 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
219 DROP TABLE t2;
220 # Make sure implicit CREATE TABLE ... SELECT inherits compression
221@@ -714,7 +714,7 @@ CREATE TABLE t2 SELECT * FROM t1;
222 SHOW CREATE TABLE t2;
223 Table Create Table
224 t2 CREATE TABLE `t2` (
225- `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
226+ `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
227 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
228 SELECT LEFT(a, 10), LENGTH(a) FROM t2;
229 LEFT(a, 10) LENGTH(a)
230@@ -750,7 +750,7 @@ ALTER TABLE t1 ENGINE=InnoDB;
231 SHOW CREATE TABLE t1;
232 Table Create Table
233 t1 CREATE TABLE `t1` (
234- `a` varchar(10000) /*!100301 COMPRESSED*/ DEFAULT NULL
235+ `a` varchar(10000) /*M!100301 COMPRESSED*/ DEFAULT NULL
236 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
237 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
238 LEFT(a, 10) LENGTH(a)
239@@ -868,7 +868,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification
240 SHOW CREATE TABLE t1;
241 Table Create Table
242 t1 CREATE TABLE `t1` (
243- `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
244+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
245 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
246 # Make sure column was actually compressed
247 INSERT INTO t1 VALUES(REPEAT('a', 1000));
248@@ -904,7 +904,7 @@ ALTER TABLE t1 MODIFY COLUMN a TEXT COMPRESSED CHARSET ucs2;
249 SHOW CREATE TABLE t1;
250 Table Create Table
251 t1 CREATE TABLE `t1` (
252- `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
253+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
254 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
255 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
256 LEFT(a, 10) LENGTH(a)
257@@ -921,7 +921,7 @@ CREATE TABLE t2 LIKE t1;
258 SHOW CREATE TABLE t2;
259 Table Create Table
260 t2 CREATE TABLE `t2` (
261- `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
262+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
263 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
264 DROP TABLE t2;
265 # Make sure implicit CREATE TABLE ... SELECT inherits compression
266@@ -929,7 +929,7 @@ CREATE TABLE t2 SELECT * FROM t1;
267 SHOW CREATE TABLE t2;
268 Table Create Table
269 t2 CREATE TABLE `t2` (
270- `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
271+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
272 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
273 SELECT LEFT(a, 10), LENGTH(a) FROM t2;
274 LEFT(a, 10) LENGTH(a)
275@@ -965,7 +965,7 @@ ALTER TABLE t1 ENGINE=InnoDB;
276 SHOW CREATE TABLE t1;
277 Table Create Table
278 t1 CREATE TABLE `t1` (
279- `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
280+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
281 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
282 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
283 LEFT(a, 10) LENGTH(a)
284@@ -1084,7 +1084,7 @@ ERROR HY000: Compressed column 'a' can't be used in key specification
285 SHOW CREATE TABLE t1;
286 Table Create Table
287 t1 CREATE TABLE `t1` (
288- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
289+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
290 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
291 # Make sure column was actually compressed
292 INSERT INTO t1 VALUES(REPEAT('a', 1000));
293@@ -1120,7 +1120,7 @@ ALTER TABLE t1 MODIFY COLUMN a BLOB COMPRESSED;
294 SHOW CREATE TABLE t1;
295 Table Create Table
296 t1 CREATE TABLE `t1` (
297- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
298+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
299 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
300 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
301 LEFT(a, 10) LENGTH(a)
302@@ -1137,7 +1137,7 @@ CREATE TABLE t2 LIKE t1;
303 SHOW CREATE TABLE t2;
304 Table Create Table
305 t2 CREATE TABLE `t2` (
306- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
307+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
308 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
309 DROP TABLE t2;
310 # Make sure implicit CREATE TABLE ... SELECT inherits compression
311@@ -1145,7 +1145,7 @@ CREATE TABLE t2 SELECT * FROM t1;
312 SHOW CREATE TABLE t2;
313 Table Create Table
314 t2 CREATE TABLE `t2` (
315- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
316+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
317 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
318 SELECT LEFT(a, 10), LENGTH(a) FROM t2;
319 LEFT(a, 10) LENGTH(a)
320@@ -1181,7 +1181,7 @@ ALTER TABLE t1 ENGINE=InnoDB;
321 SHOW CREATE TABLE t1;
322 Table Create Table
323 t1 CREATE TABLE `t1` (
324- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
325+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
326 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
327 SELECT LEFT(a, 10), LENGTH(a) FROM t1;
328 LEFT(a, 10) LENGTH(a)
329@@ -1323,7 +1323,7 @@ LENGTH(a)
330 SHOW CREATE TABLE t1;
331 Table Create Table
332 t1 CREATE TABLE `t1` (
333- `a` blob /*!100301 COMPRESSED*/ NOT NULL DEFAULT ''
334+ `a` blob /*M!100301 COMPRESSED*/ NOT NULL DEFAULT ''
335 ) ENGINE=CSV DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
336 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
337 DROP TABLE t1;
338@@ -1373,7 +1373,7 @@ CREATE TABLE t1(a VARCHAR(255) COMPRESSED);
339 SHOW CREATE TABLE t1;
340 Table Create Table
341 t1 CREATE TABLE `t1` (
342- `a` varchar(255) /*!100301 COMPRESSED*/ DEFAULT NULL
343+ `a` varchar(255) /*M!100301 COMPRESSED*/ DEFAULT NULL
344 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
345 SET column_compression_threshold=300;
346 INSERT INTO t1 VALUES(REPEAT('a', 255));
347@@ -1483,12 +1483,12 @@ CREATE OR REPLACE TABLE t1 (a VARCHAR(1000) COMPRESSED CHARACTER SET utf8);
348 SHOW CREATE TABLE t1;
349 Table Create Table
350 t1 CREATE TABLE `t1` (
351- `a` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
352+ `a` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
353 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
354 SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS
355 WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
356 COLUMN_TYPE
357-varchar(1000) /*!100301 COMPRESSED*/
358+varchar(1000) /*M!100301 COMPRESSED*/
359 DROP TABLE t1;
360 #
361 # MDEV-17363 - Compressed columns cannot be restored from dump
362@@ -1507,10 +1507,10 @@ d TINYTEXT COMPRESSED BINARY
363 SHOW CREATE TABLE t1;
364 Table Create Table
365 t1 CREATE TABLE `t1` (
366- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`)),
367- `b` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
368- `c` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
369- `d` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
370+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`)),
371+ `b` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
372+ `c` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
373+ `d` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
374 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
375 DROP TABLE t1;
376 #
377@@ -1524,49 +1524,49 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED);
378 SHOW CREATE TABLE t1;
379 Table Create Table
380 t1 CREATE TABLE `t1` (
381- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
382+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
383 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
384 DROP TABLE t1;
385 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY);
386 SHOW CREATE TABLE t1;
387 Table Create Table
388 t1 CREATE TABLE `t1` (
389- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
390+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
391 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
392 DROP TABLE t1;
393 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY ASCII);
394 SHOW CREATE TABLE t1;
395 Table Create Table
396 t1 CREATE TABLE `t1` (
397- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
398+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
399 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
400 DROP TABLE t1;
401 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE);
402 SHOW CREATE TABLE t1;
403 Table Create Table
404 t1 CREATE TABLE `t1` (
405- `a` varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL
406+ `a` varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
407 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
408 DROP TABLE t1;
409 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII);
410 SHOW CREATE TABLE t1;
411 Table Create Table
412 t1 CREATE TABLE `t1` (
413- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
414+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
415 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
416 DROP TABLE t1;
417 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED UNICODE);
418 SHOW CREATE TABLE t1;
419 Table Create Table
420 t1 CREATE TABLE `t1` (
421- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
422+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
423 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
424 DROP TABLE t1;
425 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8);
426 SHOW CREATE TABLE t1;
427 Table Create Table
428 t1 CREATE TABLE `t1` (
429- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
430+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
431 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
432 DROP TABLE t1;
433 #
434@@ -1577,35 +1577,35 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE DEFAULT '');
435 SHOW CREATE TABLE t1;
436 Table Create Table
437 t1 CREATE TABLE `t1` (
438- `a` varbinary(10) /*!100301 COMPRESSED*/ DEFAULT ''
439+ `a` varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT ''
440 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
441 DROP TABLE t1;
442 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY DEFAULT '');
443 SHOW CREATE TABLE t1;
444 Table Create Table
445 t1 CREATE TABLE `t1` (
446- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
447+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
448 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
449 DROP TABLE t1;
450 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII DEFAULT '');
451 SHOW CREATE TABLE t1;
452 Table Create Table
453 t1 CREATE TABLE `t1` (
454- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT ''
455+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT ''
456 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
457 DROP TABLE t1;
458 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 DEFAULT '');
459 SHOW CREATE TABLE t1;
460 Table Create Table
461 t1 CREATE TABLE `t1` (
462- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
463+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
464 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
465 DROP TABLE t1;
466 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
467 SHOW CREATE TABLE t1;
468 Table Create Table
469 t1 CREATE TABLE `t1` (
470- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
471+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
472 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
473 DROP TABLE t1;
474 #
475@@ -1617,7 +1617,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
476 SHOW CREATE TABLE t1;
477 Table Create Table
478 t1 CREATE TABLE `t1` (
479- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
480+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
481 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
482 DROP TABLE t1;
483 CREATE TABLE t1 (a VARCHAR(10) ASCII COMPRESSED);
484@@ -1626,7 +1626,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
485 SHOW CREATE TABLE t1;
486 Table Create Table
487 t1 CREATE TABLE `t1` (
488- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
489+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
490 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
491 DROP TABLE t1;
492 CREATE TABLE t1 (a VARCHAR(10) BYTE COMPRESSED);
493@@ -1635,7 +1635,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
494 SHOW CREATE TABLE t1;
495 Table Create Table
496 t1 CREATE TABLE `t1` (
497- `a` varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL
498+ `a` varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
499 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
500 DROP TABLE t1;
501 #
502@@ -1675,49 +1675,49 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED);
503 SHOW CREATE TABLE t1;
504 Table Create Table
505 t1 CREATE TABLE `t1` (
506- `a` tinytext /*!100301 COMPRESSED*/ DEFAULT NULL
507+ `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL
508 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
509 DROP TABLE t1;
510 CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY);
511 SHOW CREATE TABLE t1;
512 Table Create Table
513 t1 CREATE TABLE `t1` (
514- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
515+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
516 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
517 DROP TABLE t1;
518 CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY ASCII);
519 SHOW CREATE TABLE t1;
520 Table Create Table
521 t1 CREATE TABLE `t1` (
522- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
523+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
524 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
525 DROP TABLE t1;
526 CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE);
527 SHOW CREATE TABLE t1;
528 Table Create Table
529 t1 CREATE TABLE `t1` (
530- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
531+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
532 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
533 DROP TABLE t1;
534 CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII);
535 SHOW CREATE TABLE t1;
536 Table Create Table
537 t1 CREATE TABLE `t1` (
538- `a` tinytext /*!100301 COMPRESSED*/ DEFAULT NULL
539+ `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL
540 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
541 DROP TABLE t1;
542 CREATE TABLE t1 (a TINYTEXT COMPRESSED UNICODE);
543 SHOW CREATE TABLE t1;
544 Table Create Table
545 t1 CREATE TABLE `t1` (
546- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
547+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
548 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
549 DROP TABLE t1;
550 CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8);
551 SHOW CREATE TABLE t1;
552 Table Create Table
553 t1 CREATE TABLE `t1` (
554- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
555+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
556 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
557 DROP TABLE t1;
558 #
559@@ -1728,35 +1728,35 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE DEFAULT '');
560 SHOW CREATE TABLE t1;
561 Table Create Table
562 t1 CREATE TABLE `t1` (
563- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT ''
564+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT ''
565 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
566 DROP TABLE t1;
567 CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY DEFAULT '');
568 SHOW CREATE TABLE t1;
569 Table Create Table
570 t1 CREATE TABLE `t1` (
571- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
572+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
573 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
574 DROP TABLE t1;
575 CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII DEFAULT '');
576 SHOW CREATE TABLE t1;
577 Table Create Table
578 t1 CREATE TABLE `t1` (
579- `a` tinytext /*!100301 COMPRESSED*/ DEFAULT ''
580+ `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT ''
581 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
582 DROP TABLE t1;
583 CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
584 SHOW CREATE TABLE t1;
585 Table Create Table
586 t1 CREATE TABLE `t1` (
587- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
588+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
589 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
590 DROP TABLE t1;
591 CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
592 SHOW CREATE TABLE t1;
593 Table Create Table
594 t1 CREATE TABLE `t1` (
595- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
596+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
597 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
598 DROP TABLE t1;
599 #
600@@ -1768,7 +1768,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
601 SHOW CREATE TABLE t1;
602 Table Create Table
603 t1 CREATE TABLE `t1` (
604- `a` tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
605+ `a` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
606 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
607 DROP TABLE t1;
608 CREATE TABLE t1 (a TINYTEXT ASCII COMPRESSED);
609@@ -1777,7 +1777,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
610 SHOW CREATE TABLE t1;
611 Table Create Table
612 t1 CREATE TABLE `t1` (
613- `a` tinytext /*!100301 COMPRESSED*/ DEFAULT NULL
614+ `a` tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL
615 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
616 DROP TABLE t1;
617 CREATE TABLE t1 (a TINYTEXT BYTE COMPRESSED);
618@@ -1786,7 +1786,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
619 SHOW CREATE TABLE t1;
620 Table Create Table
621 t1 CREATE TABLE `t1` (
622- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
623+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
624 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
625 DROP TABLE t1;
626 #
627@@ -1826,49 +1826,49 @@ CREATE TABLE t1 (a TEXT COMPRESSED);
628 SHOW CREATE TABLE t1;
629 Table Create Table
630 t1 CREATE TABLE `t1` (
631- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
632+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
633 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
634 DROP TABLE t1;
635 CREATE TABLE t1 (a TEXT COMPRESSED BINARY);
636 SHOW CREATE TABLE t1;
637 Table Create Table
638 t1 CREATE TABLE `t1` (
639- `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
640+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
641 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
642 DROP TABLE t1;
643 CREATE TABLE t1 (a TEXT COMPRESSED BINARY ASCII);
644 SHOW CREATE TABLE t1;
645 Table Create Table
646 t1 CREATE TABLE `t1` (
647- `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
648+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
649 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
650 DROP TABLE t1;
651 CREATE TABLE t1 (a TEXT COMPRESSED BYTE);
652 SHOW CREATE TABLE t1;
653 Table Create Table
654 t1 CREATE TABLE `t1` (
655- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
656+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
657 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
658 DROP TABLE t1;
659 CREATE TABLE t1 (a TEXT COMPRESSED ASCII);
660 SHOW CREATE TABLE t1;
661 Table Create Table
662 t1 CREATE TABLE `t1` (
663- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
664+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
665 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
666 DROP TABLE t1;
667 CREATE TABLE t1 (a TEXT COMPRESSED UNICODE);
668 SHOW CREATE TABLE t1;
669 Table Create Table
670 t1 CREATE TABLE `t1` (
671- `a` text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
672+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
673 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
674 DROP TABLE t1;
675 CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8);
676 SHOW CREATE TABLE t1;
677 Table Create Table
678 t1 CREATE TABLE `t1` (
679- `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
680+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
681 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
682 DROP TABLE t1;
683 #
684@@ -1879,35 +1879,35 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE DEFAULT '');
685 SHOW CREATE TABLE t1;
686 Table Create Table
687 t1 CREATE TABLE `t1` (
688- `a` blob /*!100301 COMPRESSED*/ DEFAULT ''
689+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT ''
690 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
691 DROP TABLE t1;
692 CREATE TABLE t1 (a TEXT COMPRESSED BINARY DEFAULT '');
693 SHOW CREATE TABLE t1;
694 Table Create Table
695 t1 CREATE TABLE `t1` (
696- `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
697+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
698 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
699 DROP TABLE t1;
700 CREATE TABLE t1 (a TEXT COMPRESSED ASCII DEFAULT '');
701 SHOW CREATE TABLE t1;
702 Table Create Table
703 t1 CREATE TABLE `t1` (
704- `a` text /*!100301 COMPRESSED*/ DEFAULT ''
705+ `a` text /*M!100301 COMPRESSED*/ DEFAULT ''
706 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
707 DROP TABLE t1;
708 CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
709 SHOW CREATE TABLE t1;
710 Table Create Table
711 t1 CREATE TABLE `t1` (
712- `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
713+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
714 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
715 DROP TABLE t1;
716 CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
717 SHOW CREATE TABLE t1;
718 Table Create Table
719 t1 CREATE TABLE `t1` (
720- `a` text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
721+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
722 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
723 DROP TABLE t1;
724 #
725@@ -1919,7 +1919,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
726 SHOW CREATE TABLE t1;
727 Table Create Table
728 t1 CREATE TABLE `t1` (
729- `a` text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
730+ `a` text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
731 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
732 DROP TABLE t1;
733 CREATE TABLE t1 (a TEXT ASCII COMPRESSED);
734@@ -1928,7 +1928,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
735 SHOW CREATE TABLE t1;
736 Table Create Table
737 t1 CREATE TABLE `t1` (
738- `a` text /*!100301 COMPRESSED*/ DEFAULT NULL
739+ `a` text /*M!100301 COMPRESSED*/ DEFAULT NULL
740 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
741 DROP TABLE t1;
742 CREATE TABLE t1 (a TEXT BYTE COMPRESSED);
743@@ -1937,7 +1937,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
744 SHOW CREATE TABLE t1;
745 Table Create Table
746 t1 CREATE TABLE `t1` (
747- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
748+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
749 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
750 DROP TABLE t1;
751 #
752@@ -1977,49 +1977,49 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED);
753 SHOW CREATE TABLE t1;
754 Table Create Table
755 t1 CREATE TABLE `t1` (
756- `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL
757+ `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL
758 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
759 DROP TABLE t1;
760 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY);
761 SHOW CREATE TABLE t1;
762 Table Create Table
763 t1 CREATE TABLE `t1` (
764- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
765+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
766 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
767 DROP TABLE t1;
768 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY ASCII);
769 SHOW CREATE TABLE t1;
770 Table Create Table
771 t1 CREATE TABLE `t1` (
772- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
773+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
774 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
775 DROP TABLE t1;
776 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE);
777 SHOW CREATE TABLE t1;
778 Table Create Table
779 t1 CREATE TABLE `t1` (
780- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
781+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
782 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
783 DROP TABLE t1;
784 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII);
785 SHOW CREATE TABLE t1;
786 Table Create Table
787 t1 CREATE TABLE `t1` (
788- `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL
789+ `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL
790 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
791 DROP TABLE t1;
792 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED UNICODE);
793 SHOW CREATE TABLE t1;
794 Table Create Table
795 t1 CREATE TABLE `t1` (
796- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
797+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
798 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
799 DROP TABLE t1;
800 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8);
801 SHOW CREATE TABLE t1;
802 Table Create Table
803 t1 CREATE TABLE `t1` (
804- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
805+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
806 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
807 DROP TABLE t1;
808 #
809@@ -2030,35 +2030,35 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE DEFAULT '');
810 SHOW CREATE TABLE t1;
811 Table Create Table
812 t1 CREATE TABLE `t1` (
813- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT ''
814+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT ''
815 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
816 DROP TABLE t1;
817 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY DEFAULT '');
818 SHOW CREATE TABLE t1;
819 Table Create Table
820 t1 CREATE TABLE `t1` (
821- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
822+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
823 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
824 DROP TABLE t1;
825 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII DEFAULT '');
826 SHOW CREATE TABLE t1;
827 Table Create Table
828 t1 CREATE TABLE `t1` (
829- `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT ''
830+ `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT ''
831 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
832 DROP TABLE t1;
833 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
834 SHOW CREATE TABLE t1;
835 Table Create Table
836 t1 CREATE TABLE `t1` (
837- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
838+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
839 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
840 DROP TABLE t1;
841 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
842 SHOW CREATE TABLE t1;
843 Table Create Table
844 t1 CREATE TABLE `t1` (
845- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
846+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
847 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
848 DROP TABLE t1;
849 #
850@@ -2070,7 +2070,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
851 SHOW CREATE TABLE t1;
852 Table Create Table
853 t1 CREATE TABLE `t1` (
854- `a` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
855+ `a` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
856 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
857 DROP TABLE t1;
858 CREATE TABLE t1 (a MEDIUMTEXT ASCII COMPRESSED);
859@@ -2079,7 +2079,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
860 SHOW CREATE TABLE t1;
861 Table Create Table
862 t1 CREATE TABLE `t1` (
863- `a` mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL
864+ `a` mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL
865 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
866 DROP TABLE t1;
867 CREATE TABLE t1 (a MEDIUMTEXT BYTE COMPRESSED);
868@@ -2088,7 +2088,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
869 SHOW CREATE TABLE t1;
870 Table Create Table
871 t1 CREATE TABLE `t1` (
872- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
873+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
874 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
875 DROP TABLE t1;
876 #
877@@ -2128,49 +2128,49 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED);
878 SHOW CREATE TABLE t1;
879 Table Create Table
880 t1 CREATE TABLE `t1` (
881- `a` longtext /*!100301 COMPRESSED*/ DEFAULT NULL
882+ `a` longtext /*M!100301 COMPRESSED*/ DEFAULT NULL
883 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
884 DROP TABLE t1;
885 CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY);
886 SHOW CREATE TABLE t1;
887 Table Create Table
888 t1 CREATE TABLE `t1` (
889- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
890+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
891 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
892 DROP TABLE t1;
893 CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY ASCII);
894 SHOW CREATE TABLE t1;
895 Table Create Table
896 t1 CREATE TABLE `t1` (
897- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
898+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
899 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
900 DROP TABLE t1;
901 CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE);
902 SHOW CREATE TABLE t1;
903 Table Create Table
904 t1 CREATE TABLE `t1` (
905- `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL
906+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
907 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
908 DROP TABLE t1;
909 CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII);
910 SHOW CREATE TABLE t1;
911 Table Create Table
912 t1 CREATE TABLE `t1` (
913- `a` longtext /*!100301 COMPRESSED*/ DEFAULT NULL
914+ `a` longtext /*M!100301 COMPRESSED*/ DEFAULT NULL
915 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
916 DROP TABLE t1;
917 CREATE TABLE t1 (a LONGTEXT COMPRESSED UNICODE);
918 SHOW CREATE TABLE t1;
919 Table Create Table
920 t1 CREATE TABLE `t1` (
921- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
922+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
923 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
924 DROP TABLE t1;
925 CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8);
926 SHOW CREATE TABLE t1;
927 Table Create Table
928 t1 CREATE TABLE `t1` (
929- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
930+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
931 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
932 DROP TABLE t1;
933 #
934@@ -2181,35 +2181,35 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE DEFAULT '');
935 SHOW CREATE TABLE t1;
936 Table Create Table
937 t1 CREATE TABLE `t1` (
938- `a` longblob /*!100301 COMPRESSED*/ DEFAULT ''
939+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT ''
940 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
941 DROP TABLE t1;
942 CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY DEFAULT '');
943 SHOW CREATE TABLE t1;
944 Table Create Table
945 t1 CREATE TABLE `t1` (
946- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
947+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
948 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
949 DROP TABLE t1;
950 CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII DEFAULT '');
951 SHOW CREATE TABLE t1;
952 Table Create Table
953 t1 CREATE TABLE `t1` (
954- `a` longtext /*!100301 COMPRESSED*/ DEFAULT ''
955+ `a` longtext /*M!100301 COMPRESSED*/ DEFAULT ''
956 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
957 DROP TABLE t1;
958 CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
959 SHOW CREATE TABLE t1;
960 Table Create Table
961 t1 CREATE TABLE `t1` (
962- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
963+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
964 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
965 DROP TABLE t1;
966 CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
967 SHOW CREATE TABLE t1;
968 Table Create Table
969 t1 CREATE TABLE `t1` (
970- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
971+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
972 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
973 DROP TABLE t1;
974 #
975@@ -2221,7 +2221,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
976 SHOW CREATE TABLE t1;
977 Table Create Table
978 t1 CREATE TABLE `t1` (
979- `a` longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
980+ `a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
981 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
982 DROP TABLE t1;
983 CREATE TABLE t1 (a LONGTEXT ASCII COMPRESSED);
984@@ -2230,7 +2230,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
985 SHOW CREATE TABLE t1;
986 Table Create Table
987 t1 CREATE TABLE `t1` (
988- `a` longtext /*!100301 COMPRESSED*/ DEFAULT NULL
989+ `a` longtext /*M!100301 COMPRESSED*/ DEFAULT NULL
990 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
991 DROP TABLE t1;
992 CREATE TABLE t1 (a LONGTEXT BYTE COMPRESSED);
993@@ -2239,7 +2239,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
994 SHOW CREATE TABLE t1;
995 Table Create Table
996 t1 CREATE TABLE `t1` (
997- `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL
998+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
999 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1000 DROP TABLE t1;
1001 #
1002@@ -2281,7 +2281,7 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED);
1003 SHOW CREATE TABLE t1;
1004 Table Create Table
1005 t1 CREATE TABLE `t1` (
1006- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
1007+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
1008 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1009 DROP TABLE t1;
1010 #
1011@@ -2292,21 +2292,21 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED DEFAULT '');
1012 SHOW CREATE TABLE t1;
1013 Table Create Table
1014 t1 CREATE TABLE `t1` (
1015- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT ''
1016+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT ''
1017 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1018 DROP TABLE t1;
1019 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED NULL);
1020 SHOW CREATE TABLE t1;
1021 Table Create Table
1022 t1 CREATE TABLE `t1` (
1023- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
1024+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
1025 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1026 DROP TABLE t1;
1027 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
1028 SHOW CREATE TABLE t1;
1029 Table Create Table
1030 t1 CREATE TABLE `t1` (
1031- `a` varchar(10) /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1032+ `a` varchar(10) /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1033 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1034 DROP TABLE t1;
1035 #
1036@@ -2318,7 +2318,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1037 SHOW CREATE TABLE t1;
1038 Table Create Table
1039 t1 CREATE TABLE `t1` (
1040- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT ''
1041+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT ''
1042 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1043 DROP TABLE t1;
1044 CREATE TABLE t1 (a VARCHAR(10) NULL COMPRESSED);
1045@@ -2327,7 +2327,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1046 SHOW CREATE TABLE t1;
1047 Table Create Table
1048 t1 CREATE TABLE `t1` (
1049- `a` varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
1050+ `a` varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
1051 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1052 DROP TABLE t1;
1053 #
1054@@ -2356,7 +2356,7 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED);
1055 SHOW CREATE TABLE t1;
1056 Table Create Table
1057 t1 CREATE TABLE `t1` (
1058- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
1059+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1060 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1061 DROP TABLE t1;
1062 #
1063@@ -2367,21 +2367,21 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED DEFAULT '');
1064 SHOW CREATE TABLE t1;
1065 Table Create Table
1066 t1 CREATE TABLE `t1` (
1067- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT ''
1068+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT ''
1069 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1070 DROP TABLE t1;
1071 CREATE TABLE t1 (a TINYBLOB COMPRESSED NULL);
1072 SHOW CREATE TABLE t1;
1073 Table Create Table
1074 t1 CREATE TABLE `t1` (
1075- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
1076+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1077 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1078 DROP TABLE t1;
1079 CREATE TABLE t1 (a TINYBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
1080 SHOW CREATE TABLE t1;
1081 Table Create Table
1082 t1 CREATE TABLE `t1` (
1083- `a` tinyblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1084+ `a` tinyblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1085 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1086 DROP TABLE t1;
1087 #
1088@@ -2393,7 +2393,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1089 SHOW CREATE TABLE t1;
1090 Table Create Table
1091 t1 CREATE TABLE `t1` (
1092- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT ''
1093+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT ''
1094 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1095 DROP TABLE t1;
1096 CREATE TABLE t1 (a TINYBLOB NULL COMPRESSED);
1097@@ -2402,7 +2402,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1098 SHOW CREATE TABLE t1;
1099 Table Create Table
1100 t1 CREATE TABLE `t1` (
1101- `a` tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
1102+ `a` tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1103 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1104 DROP TABLE t1;
1105 #
1106@@ -2431,7 +2431,7 @@ CREATE TABLE t1 (a BLOB COMPRESSED);
1107 SHOW CREATE TABLE t1;
1108 Table Create Table
1109 t1 CREATE TABLE `t1` (
1110- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
1111+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
1112 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1113 DROP TABLE t1;
1114 #
1115@@ -2442,21 +2442,21 @@ CREATE TABLE t1 (a BLOB COMPRESSED DEFAULT '');
1116 SHOW CREATE TABLE t1;
1117 Table Create Table
1118 t1 CREATE TABLE `t1` (
1119- `a` blob /*!100301 COMPRESSED*/ DEFAULT ''
1120+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT ''
1121 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1122 DROP TABLE t1;
1123 CREATE TABLE t1 (a BLOB COMPRESSED NULL);
1124 SHOW CREATE TABLE t1;
1125 Table Create Table
1126 t1 CREATE TABLE `t1` (
1127- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
1128+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
1129 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1130 DROP TABLE t1;
1131 CREATE TABLE t1 (a BLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
1132 SHOW CREATE TABLE t1;
1133 Table Create Table
1134 t1 CREATE TABLE `t1` (
1135- `a` blob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1136+ `a` blob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1137 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1138 DROP TABLE t1;
1139 #
1140@@ -2468,7 +2468,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1141 SHOW CREATE TABLE t1;
1142 Table Create Table
1143 t1 CREATE TABLE `t1` (
1144- `a` blob /*!100301 COMPRESSED*/ DEFAULT ''
1145+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT ''
1146 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1147 DROP TABLE t1;
1148 CREATE TABLE t1 (a BLOB NULL COMPRESSED);
1149@@ -2477,7 +2477,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1150 SHOW CREATE TABLE t1;
1151 Table Create Table
1152 t1 CREATE TABLE `t1` (
1153- `a` blob /*!100301 COMPRESSED*/ DEFAULT NULL
1154+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT NULL
1155 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1156 DROP TABLE t1;
1157 #
1158@@ -2506,7 +2506,7 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED);
1159 SHOW CREATE TABLE t1;
1160 Table Create Table
1161 t1 CREATE TABLE `t1` (
1162- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
1163+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1164 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1165 DROP TABLE t1;
1166 #
1167@@ -2517,21 +2517,21 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED DEFAULT '');
1168 SHOW CREATE TABLE t1;
1169 Table Create Table
1170 t1 CREATE TABLE `t1` (
1171- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT ''
1172+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT ''
1173 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1174 DROP TABLE t1;
1175 CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED NULL);
1176 SHOW CREATE TABLE t1;
1177 Table Create Table
1178 t1 CREATE TABLE `t1` (
1179- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
1180+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1181 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1182 DROP TABLE t1;
1183 CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
1184 SHOW CREATE TABLE t1;
1185 Table Create Table
1186 t1 CREATE TABLE `t1` (
1187- `a` mediumblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1188+ `a` mediumblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1189 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1190 DROP TABLE t1;
1191 #
1192@@ -2543,7 +2543,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1193 SHOW CREATE TABLE t1;
1194 Table Create Table
1195 t1 CREATE TABLE `t1` (
1196- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT ''
1197+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT ''
1198 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1199 DROP TABLE t1;
1200 CREATE TABLE t1 (a MEDIUMBLOB NULL COMPRESSED);
1201@@ -2552,7 +2552,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1202 SHOW CREATE TABLE t1;
1203 Table Create Table
1204 t1 CREATE TABLE `t1` (
1205- `a` mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
1206+ `a` mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1207 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1208 DROP TABLE t1;
1209 #
1210@@ -2581,7 +2581,7 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED);
1211 SHOW CREATE TABLE t1;
1212 Table Create Table
1213 t1 CREATE TABLE `t1` (
1214- `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL
1215+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1216 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1217 DROP TABLE t1;
1218 #
1219@@ -2592,21 +2592,21 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED DEFAULT '');
1220 SHOW CREATE TABLE t1;
1221 Table Create Table
1222 t1 CREATE TABLE `t1` (
1223- `a` longblob /*!100301 COMPRESSED*/ DEFAULT ''
1224+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT ''
1225 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1226 DROP TABLE t1;
1227 CREATE TABLE t1 (a LONGBLOB COMPRESSED NULL);
1228 SHOW CREATE TABLE t1;
1229 Table Create Table
1230 t1 CREATE TABLE `t1` (
1231- `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL
1232+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1233 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1234 DROP TABLE t1;
1235 CREATE TABLE t1 (a LONGBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
1236 SHOW CREATE TABLE t1;
1237 Table Create Table
1238 t1 CREATE TABLE `t1` (
1239- `a` longblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1240+ `a` longblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
1241 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1242 DROP TABLE t1;
1243 #
1244@@ -2618,7 +2618,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1245 SHOW CREATE TABLE t1;
1246 Table Create Table
1247 t1 CREATE TABLE `t1` (
1248- `a` longblob /*!100301 COMPRESSED*/ DEFAULT ''
1249+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT ''
1250 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1251 DROP TABLE t1;
1252 CREATE TABLE t1 (a LONGBLOB NULL COMPRESSED);
1253@@ -2627,7 +2627,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
1254 SHOW CREATE TABLE t1;
1255 Table Create Table
1256 t1 CREATE TABLE `t1` (
1257- `a` longblob /*!100301 COMPRESSED*/ DEFAULT NULL
1258+ `a` longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
1259 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1260 DROP TABLE t1;
1261 #
1262@@ -2656,7 +2656,7 @@ CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED);
1263 SHOW CREATE TABLE t1;
1264 Table Create Table
1265 t1 CREATE TABLE `t1` (
1266- `a` varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
1267+ `a` varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
1268 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1269 DROP TABLE t1;
1270 CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED BINARY COMPRESSED);
1271diff --git a/mysql-test/main/column_compression_parts.result b/mysql-test/main/column_compression_parts.result
1272index fa12217c..a119ada1 100644
1273--- a/mysql-test/main/column_compression_parts.result
1274+++ b/mysql-test/main/column_compression_parts.result
1275@@ -65,7 +65,7 @@ SHOW CREATE TABLE t1;
1276 Table Create Table
1277 t1 CREATE TABLE `t1` (
1278 `i` int(11) DEFAULT NULL,
1279- `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT 'AAA'
1280+ `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT 'AAA'
1281 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1282 PARTITION BY RANGE COLUMNS(`a`)
1283 (PARTITION `p1` VALUES LESS THAN ('m') ENGINE = MyISAM,
1284@@ -133,7 +133,7 @@ ALTER TABLE t1 MODIFY COLUMN a VARCHAR(1000) COMPRESSED;
1285 SHOW CREATE TABLE t1;
1286 Table Create Table
1287 t1 CREATE TABLE `t1` (
1288- `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT NULL,
1289+ `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT NULL,
1290 `id` int(11) DEFAULT NULL
1291 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1292 PARTITION BY RANGE COLUMNS(`id`,`a`)
1293@@ -166,7 +166,7 @@ ALTER TABLE t1 PARTITION BY KEY(a) PARTITIONS 6;
1294 SHOW CREATE TABLE t1;
1295 Table Create Table
1296 t1 CREATE TABLE `t1` (
1297- `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT '10-12-2010'
1298+ `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT '10-12-2010'
1299 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1300 PARTITION BY KEY (`a`)
1301 PARTITIONS 6
1302@@ -231,7 +231,7 @@ ALTER TABLE t2 REMOVE PARTITIONING;
1303 SHOW CREATE TABLE t1;
1304 Table Create Table
1305 t1 CREATE TABLE `t1` (
1306- `a` varchar(200) /*!100301 COMPRESSED*/ DEFAULT NULL
1307+ `a` varchar(200) /*M!100301 COMPRESSED*/ DEFAULT NULL
1308 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1309 PARTITION BY KEY (`a`)
1310 (PARTITION `p0` ENGINE = MyISAM,
1311@@ -248,7 +248,7 @@ t1 CREATE TABLE `t1` (
1312 SHOW CREATE TABLE t2;
1313 Table Create Table
1314 t2 CREATE TABLE `t2` (
1315- `a` varchar(200) /*!100301 COMPRESSED*/ DEFAULT NULL
1316+ `a` varchar(200) /*M!100301 COMPRESSED*/ DEFAULT NULL
1317 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1318 ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2;
1319 DROP TABLE t1,t2;
1320@@ -266,7 +266,7 @@ ERROR HY000: Only RANGE PARTITIONING can use VALUES LESS THAN in partition defin
1321 SHOW CREATE TABLE t1;
1322 Table Create Table
1323 t1 CREATE TABLE `t1` (
1324- `a` blob /*!100301 COMPRESSED*/ DEFAULT 5,
1325+ `a` blob /*M!100301 COMPRESSED*/ DEFAULT 5,
1326 `i` int(11) DEFAULT NULL
1327 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1328 PARTITION BY HASH (`i`)
1329@@ -283,7 +283,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p2 INTO (PARTITION p22 VALUES LESS THAN (MAX
1330 SHOW CREATE TABLE t1;
1331 Table Create Table
1332 t1 CREATE TABLE `t1` (
1333- `a` varchar(500) /*!100301 COMPRESSED*/ DEFAULT '5',
1334+ `a` varchar(500) /*M!100301 COMPRESSED*/ DEFAULT '5',
1335 `i` int(11) DEFAULT NULL
1336 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
1337 PARTITION BY RANGE COLUMNS(`i`)
1338diff --git a/mysql-test/main/mysqlbinlog_row_compressed.result b/mysql-test/main/mysqlbinlog_row_compressed.result
1339index a6846f24..e3533e4a 100644
1340--- a/mysql-test/main/mysqlbinlog_row_compressed.result
1341+++ b/mysql-test/main/mysqlbinlog_row_compressed.result
1342@@ -24,10 +24,10 @@ ROLLBACK/*!*/;
1343 #<date> server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001
1344 # at 329
1345 #<date> server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl
1346-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1347-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
1348-/*!100001 SET @@session.server_id=1*//*!*/;
1349-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
1350+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1351+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
1352+/*M!100001 SET @@session.server_id=1*//*!*/;
1353+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
1354 # at 371
1355 #<date> server id 1 end_log_pos 542 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 xid=<xid>
1356 use `test`/*!*/;
1357@@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
1358 /*!*/;
1359 # at 542
1360 #<date> server id 1 end_log_pos 584 CRC32 XXX GTID 0-1-2 ddl
1361-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
1362+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
1363 # at 584
1364 #<date> server id 1 end_log_pos 745 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 xid=<xid>
1365 SET TIMESTAMP=X/*!*/;
1366@@ -52,7 +52,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
1367 /*!*/;
1368 # at 745
1369 #<date> server id 1 end_log_pos 787 CRC32 XXX GTID 0-1-3
1370-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
1371+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
1372 START TRANSACTION
1373 /*!*/;
1374 # at 787
1375@@ -81,7 +81,7 @@ COMMIT
1376 /*!*/;
1377 # at 1058
1378 #<date> server id 1 end_log_pos 1100 CRC32 XXX GTID 0-1-4
1379-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
1380+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
1381 START TRANSACTION
1382 /*!*/;
1383 # at 1100
1384@@ -110,7 +110,7 @@ COMMIT
1385 /*!*/;
1386 # at 1372
1387 #<date> server id 1 end_log_pos 1414 CRC32 XXX GTID 0-1-5
1388-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
1389+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
1390 START TRANSACTION
1391 /*!*/;
1392 # at 1414
1393@@ -139,7 +139,7 @@ COMMIT
1394 /*!*/;
1395 # at 1687
1396 #<date> server id 1 end_log_pos 1729 CRC32 XXX GTID 0-1-6
1397-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
1398+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
1399 START TRANSACTION
1400 /*!*/;
1401 # at 1729
1402@@ -168,7 +168,7 @@ COMMIT
1403 /*!*/;
1404 # at 2000
1405 #<date> server id 1 end_log_pos 2042 CRC32 XXX GTID 0-1-7
1406-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
1407+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
1408 START TRANSACTION
1409 /*!*/;
1410 # at 2042
1411@@ -230,7 +230,7 @@ COMMIT
1412 /*!*/;
1413 # at 2316
1414 #<date> server id 1 end_log_pos 2358 CRC32 XXX GTID 0-1-8
1415-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
1416+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
1417 START TRANSACTION
1418 /*!*/;
1419 # at 2358
1420@@ -311,7 +311,7 @@ COMMIT
1421 /*!*/;
1422 # at 2652
1423 #<date> server id 1 end_log_pos 2694 CRC32 XXX GTID 0-1-9
1424-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
1425+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
1426 START TRANSACTION
1427 /*!*/;
1428 # at 2694
1429@@ -373,7 +373,7 @@ COMMIT
1430 /*!*/;
1431 # at 2952
1432 #<date> server id 1 end_log_pos 2994 CRC32 XXX GTID 0-1-10
1433-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
1434+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
1435 START TRANSACTION
1436 /*!*/;
1437 # at 2994
1438diff --git a/mysql-test/main/mysqlbinlog_row_minimal.result b/mysql-test/main/mysqlbinlog_row_minimal.result
1439index 99d5757b..81f37f40 100644
1440--- a/mysql-test/main/mysqlbinlog_row_minimal.result
1441+++ b/mysql-test/main/mysqlbinlog_row_minimal.result
1442@@ -22,10 +22,10 @@ ROLLBACK/*!*/;
1443 #<date> server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001
1444 # at 329
1445 #<date> server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl
1446-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1447-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
1448-/*!100001 SET @@session.server_id=1*//*!*/;
1449-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
1450+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1451+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
1452+/*M!100001 SET @@session.server_id=1*//*!*/;
1453+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
1454 # at 371
1455 #<date> server id 1 end_log_pos 564 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 xid=<xid>
1456 use `test`/*!*/;
1457@@ -42,7 +42,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
1458 /*!*/;
1459 # at 564
1460 #<date> server id 1 end_log_pos 606 CRC32 XXX GTID 0-1-2 ddl
1461-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
1462+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
1463 # at 606
1464 #<date> server id 1 end_log_pos 792 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 xid=<xid>
1465 SET TIMESTAMP=X/*!*/;
1466@@ -50,7 +50,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
1467 /*!*/;
1468 # at 792
1469 #<date> server id 1 end_log_pos 834 CRC32 XXX GTID 0-1-3
1470-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
1471+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
1472 START TRANSACTION
1473 /*!*/;
1474 # at 834
1475@@ -79,7 +79,7 @@ COMMIT
1476 /*!*/;
1477 # at 1106
1478 #<date> server id 1 end_log_pos 1148 CRC32 XXX GTID 0-1-4
1479-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
1480+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
1481 START TRANSACTION
1482 /*!*/;
1483 # at 1148
1484@@ -108,7 +108,7 @@ COMMIT
1485 /*!*/;
1486 # at 1421
1487 #<date> server id 1 end_log_pos 1463 CRC32 XXX GTID 0-1-5
1488-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
1489+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
1490 START TRANSACTION
1491 /*!*/;
1492 # at 1463
1493@@ -137,7 +137,7 @@ COMMIT
1494 /*!*/;
1495 # at 1737
1496 #<date> server id 1 end_log_pos 1779 CRC32 XXX GTID 0-1-6
1497-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
1498+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
1499 START TRANSACTION
1500 /*!*/;
1501 # at 1779
1502@@ -166,7 +166,7 @@ COMMIT
1503 /*!*/;
1504 # at 2053
1505 #<date> server id 1 end_log_pos 2095 CRC32 XXX GTID 0-1-7
1506-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
1507+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
1508 START TRANSACTION
1509 /*!*/;
1510 # at 2095
1511@@ -228,7 +228,7 @@ COMMIT
1512 /*!*/;
1513 # at 2445
1514 #<date> server id 1 end_log_pos 2487 CRC32 XXX GTID 0-1-8
1515-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
1516+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
1517 START TRANSACTION
1518 /*!*/;
1519 # at 2487
1520@@ -261,7 +261,7 @@ COMMIT
1521 /*!*/;
1522 # at 2748
1523 #<date> server id 1 end_log_pos 2790 CRC32 XXX GTID 0-1-9
1524-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
1525+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
1526 START TRANSACTION
1527 /*!*/;
1528 # at 2790
1529@@ -291,7 +291,7 @@ COMMIT
1530 /*!*/;
1531 # at 3010
1532 #<date> server id 1 end_log_pos 3052 CRC32 XXX GTID 0-1-10
1533-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
1534+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
1535 START TRANSACTION
1536 /*!*/;
1537 # at 3052
1538@@ -371,10 +371,10 @@ FLUSH BINARY LOGS;
1539 DELIMITER /*!*/;
1540 # at POS
1541 #<date> server id 1 end_log_pos END_LOG_POS CRC32 XXX GTID D-S-N
1542-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1543-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
1544-/*!100001 SET @@session.server_id=1*//*!*/;
1545-/*!100001 SET @@session.gtid_seq_no=21*//*!*/;
1546+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1547+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
1548+/*M!100001 SET @@session.server_id=1*//*!*/;
1549+/*M!100001 SET @@session.gtid_seq_no=21*//*!*/;
1550 START TRANSACTION
1551 /*!*/;
1552 # at POS
1553diff --git a/mysql-test/main/mysqlbinlog_stmt_compressed.result b/mysql-test/main/mysqlbinlog_stmt_compressed.result
1554index 7e709eee..b18cceb7 100644
1555--- a/mysql-test/main/mysqlbinlog_stmt_compressed.result
1556+++ b/mysql-test/main/mysqlbinlog_stmt_compressed.result
1557@@ -24,10 +24,10 @@ ROLLBACK/*!*/;
1558 #<date> server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001
1559 # at 329
1560 #<date> server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl
1561-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1562-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
1563-/*!100001 SET @@session.server_id=1*//*!*/;
1564-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
1565+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1566+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
1567+/*M!100001 SET @@session.server_id=1*//*!*/;
1568+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
1569 # at 371
1570 #<date> server id 1 end_log_pos 542 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 xid=<xid>
1571 use `test`/*!*/;
1572@@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
1573 /*!*/;
1574 # at 542
1575 #<date> server id 1 end_log_pos 584 CRC32 XXX GTID 0-1-2 ddl
1576-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
1577+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
1578 # at 584
1579 #<date> server id 1 end_log_pos 745 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 xid=<xid>
1580 SET TIMESTAMP=X/*!*/;
1581@@ -52,7 +52,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
1582 /*!*/;
1583 # at 745
1584 #<date> server id 1 end_log_pos 787 CRC32 XXX GTID 0-1-3
1585-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
1586+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
1587 START TRANSACTION
1588 /*!*/;
1589 # at 787
1590@@ -67,7 +67,7 @@ COMMIT
1591 /*!*/;
1592 # at 988
1593 #<date> server id 1 end_log_pos 1030 CRC32 XXX GTID 0-1-4
1594-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
1595+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
1596 START TRANSACTION
1597 /*!*/;
1598 # at 1030
1599@@ -82,7 +82,7 @@ COMMIT
1600 /*!*/;
1601 # at 1231
1602 #<date> server id 1 end_log_pos 1273 CRC32 XXX GTID 0-1-5
1603-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
1604+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
1605 START TRANSACTION
1606 /*!*/;
1607 # at 1273
1608@@ -97,7 +97,7 @@ COMMIT
1609 /*!*/;
1610 # at 1476
1611 #<date> server id 1 end_log_pos 1518 CRC32 XXX GTID 0-1-6
1612-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
1613+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
1614 START TRANSACTION
1615 /*!*/;
1616 # at 1518
1617@@ -112,7 +112,7 @@ COMMIT
1618 /*!*/;
1619 # at 1718
1620 #<date> server id 1 end_log_pos 1760 CRC32 XXX GTID 0-1-7
1621-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
1622+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
1623 START TRANSACTION
1624 /*!*/;
1625 # at 1760
1626@@ -127,7 +127,7 @@ COMMIT
1627 /*!*/;
1628 # at 1941
1629 #<date> server id 1 end_log_pos 1983 CRC32 XXX GTID 0-1-8
1630-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
1631+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
1632 START TRANSACTION
1633 /*!*/;
1634 # at 1983
1635@@ -142,7 +142,7 @@ COMMIT
1636 /*!*/;
1637 # at 2173
1638 #<date> server id 1 end_log_pos 2215 CRC32 XXX GTID 0-1-9
1639-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
1640+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
1641 START TRANSACTION
1642 /*!*/;
1643 # at 2215
1644@@ -157,7 +157,7 @@ COMMIT
1645 /*!*/;
1646 # at 2379
1647 #<date> server id 1 end_log_pos 2421 CRC32 XXX GTID 0-1-10
1648-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
1649+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
1650 START TRANSACTION
1651 /*!*/;
1652 # at 2421
1653diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
1654index 9195f9fd..7e02d3e0 100644
1655--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
1656+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
1657@@ -367,10 +367,10 @@ ROLLBACK/*!*/;
1658 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
1659 # at #
1660 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
1661-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1662-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
1663-/*!100001 SET @@session.server_id=1*//*!*/;
1664-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
1665+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
1666+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
1667+/*M!100001 SET @@session.server_id=1*//*!*/;
1668+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
1669 # at #
1670 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1671 use `test`/*!*/;
1672@@ -387,7 +387,7 @@ CREATE TABLE t1 (c01 BIT)
1673 /*!*/;
1674 # at #
1675 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2
1676-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
1677+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
1678 START TRANSACTION
1679 /*!*/;
1680 # at #
1681@@ -408,7 +408,7 @@ COMMIT
1682 /*!*/;
1683 # at #
1684 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3
1685-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
1686+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
1687 START TRANSACTION
1688 /*!*/;
1689 # at #
1690@@ -429,7 +429,7 @@ COMMIT
1691 /*!*/;
1692 # at #
1693 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 ddl
1694-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
1695+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
1696 # at #
1697 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1698 SET TIMESTAMP=1000000000/*!*/;
1699@@ -437,7 +437,7 @@ DROP TABLE `t1` /* generated by server */
1700 /*!*/;
1701 # at #
1702 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 ddl
1703-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
1704+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
1705 # at #
1706 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1707 SET TIMESTAMP=1000000000/*!*/;
1708@@ -445,7 +445,7 @@ CREATE TABLE t1 (c01 BIT(7))
1709 /*!*/;
1710 # at #
1711 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6
1712-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
1713+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
1714 START TRANSACTION
1715 /*!*/;
1716 # at #
1717@@ -466,7 +466,7 @@ COMMIT
1718 /*!*/;
1719 # at #
1720 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7
1721-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
1722+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
1723 START TRANSACTION
1724 /*!*/;
1725 # at #
1726@@ -487,7 +487,7 @@ COMMIT
1727 /*!*/;
1728 # at #
1729 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8
1730-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
1731+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
1732 START TRANSACTION
1733 /*!*/;
1734 # at #
1735@@ -508,7 +508,7 @@ COMMIT
1736 /*!*/;
1737 # at #
1738 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9
1739-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
1740+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
1741 START TRANSACTION
1742 /*!*/;
1743 # at #
1744@@ -529,7 +529,7 @@ COMMIT
1745 /*!*/;
1746 # at #
1747 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10
1748-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
1749+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
1750 START TRANSACTION
1751 /*!*/;
1752 # at #
1753@@ -550,7 +550,7 @@ COMMIT
1754 /*!*/;
1755 # at #
1756 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11
1757-/*!100001 SET @@session.gtid_seq_no=11*//*!*/;
1758+/*M!100001 SET @@session.gtid_seq_no=11*//*!*/;
1759 START TRANSACTION
1760 /*!*/;
1761 # at #
1762@@ -571,7 +571,7 @@ COMMIT
1763 /*!*/;
1764 # at #
1765 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12
1766-/*!100001 SET @@session.gtid_seq_no=12*//*!*/;
1767+/*M!100001 SET @@session.gtid_seq_no=12*//*!*/;
1768 START TRANSACTION
1769 /*!*/;
1770 # at #
1771@@ -592,7 +592,7 @@ COMMIT
1772 /*!*/;
1773 # at #
1774 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-13
1775-/*!100001 SET @@session.gtid_seq_no=13*//*!*/;
1776+/*M!100001 SET @@session.gtid_seq_no=13*//*!*/;
1777 START TRANSACTION
1778 /*!*/;
1779 # at #
1780@@ -613,7 +613,7 @@ COMMIT
1781 /*!*/;
1782 # at #
1783 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-14
1784-/*!100001 SET @@session.gtid_seq_no=14*//*!*/;
1785+/*M!100001 SET @@session.gtid_seq_no=14*//*!*/;
1786 START TRANSACTION
1787 /*!*/;
1788 # at #
1789@@ -634,7 +634,7 @@ COMMIT
1790 /*!*/;
1791 # at #
1792 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-15
1793-/*!100001 SET @@session.gtid_seq_no=15*//*!*/;
1794+/*M!100001 SET @@session.gtid_seq_no=15*//*!*/;
1795 START TRANSACTION
1796 /*!*/;
1797 # at #
1798@@ -657,7 +657,7 @@ COMMIT
1799 /*!*/;
1800 # at #
1801 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-16 ddl
1802-/*!100001 SET @@session.gtid_seq_no=16*//*!*/;
1803+/*M!100001 SET @@session.gtid_seq_no=16*//*!*/;
1804 # at #
1805 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1806 SET TIMESTAMP=1000000000/*!*/;
1807@@ -665,7 +665,7 @@ DROP TABLE `t1` /* generated by server */
1808 /*!*/;
1809 # at #
1810 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-17 ddl
1811-/*!100001 SET @@session.gtid_seq_no=17*//*!*/;
1812+/*M!100001 SET @@session.gtid_seq_no=17*//*!*/;
1813 # at #
1814 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1815 SET TIMESTAMP=1000000000/*!*/;
1816@@ -673,7 +673,7 @@ CREATE TABLE t1 (a BIT(20), b CHAR(2))
1817 /*!*/;
1818 # at #
1819 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-18
1820-/*!100001 SET @@session.gtid_seq_no=18*//*!*/;
1821+/*M!100001 SET @@session.gtid_seq_no=18*//*!*/;
1822 START TRANSACTION
1823 /*!*/;
1824 # at #
1825@@ -695,7 +695,7 @@ COMMIT
1826 /*!*/;
1827 # at #
1828 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-19 ddl
1829-/*!100001 SET @@session.gtid_seq_no=19*//*!*/;
1830+/*M!100001 SET @@session.gtid_seq_no=19*//*!*/;
1831 # at #
1832 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1833 SET TIMESTAMP=1000000000/*!*/;
1834@@ -703,7 +703,7 @@ DROP TABLE `t1` /* generated by server */
1835 /*!*/;
1836 # at #
1837 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-20 ddl
1838-/*!100001 SET @@session.gtid_seq_no=20*//*!*/;
1839+/*M!100001 SET @@session.gtid_seq_no=20*//*!*/;
1840 # at #
1841 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1842 SET TIMESTAMP=1000000000/*!*/;
1843@@ -711,7 +711,7 @@ CREATE TABLE t1 (c02 BIT(64))
1844 /*!*/;
1845 # at #
1846 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-21
1847-/*!100001 SET @@session.gtid_seq_no=21*//*!*/;
1848+/*M!100001 SET @@session.gtid_seq_no=21*//*!*/;
1849 START TRANSACTION
1850 /*!*/;
1851 # at #
1852@@ -732,7 +732,7 @@ COMMIT
1853 /*!*/;
1854 # at #
1855 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-22
1856-/*!100001 SET @@session.gtid_seq_no=22*//*!*/;
1857+/*M!100001 SET @@session.gtid_seq_no=22*//*!*/;
1858 START TRANSACTION
1859 /*!*/;
1860 # at #
1861@@ -753,7 +753,7 @@ COMMIT
1862 /*!*/;
1863 # at #
1864 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-23
1865-/*!100001 SET @@session.gtid_seq_no=23*//*!*/;
1866+/*M!100001 SET @@session.gtid_seq_no=23*//*!*/;
1867 START TRANSACTION
1868 /*!*/;
1869 # at #
1870@@ -774,7 +774,7 @@ COMMIT
1871 /*!*/;
1872 # at #
1873 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-24
1874-/*!100001 SET @@session.gtid_seq_no=24*//*!*/;
1875+/*M!100001 SET @@session.gtid_seq_no=24*//*!*/;
1876 START TRANSACTION
1877 /*!*/;
1878 # at #
1879@@ -795,7 +795,7 @@ COMMIT
1880 /*!*/;
1881 # at #
1882 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-25 ddl
1883-/*!100001 SET @@session.gtid_seq_no=25*//*!*/;
1884+/*M!100001 SET @@session.gtid_seq_no=25*//*!*/;
1885 # at #
1886 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1887 SET TIMESTAMP=1000000000/*!*/;
1888@@ -803,7 +803,7 @@ DROP TABLE `t1` /* generated by server */
1889 /*!*/;
1890 # at #
1891 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-26 ddl
1892-/*!100001 SET @@session.gtid_seq_no=26*//*!*/;
1893+/*M!100001 SET @@session.gtid_seq_no=26*//*!*/;
1894 # at #
1895 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1896 SET TIMESTAMP=1000000000/*!*/;
1897@@ -811,7 +811,7 @@ CREATE TABLE t1 (c03 TINYINT)
1898 /*!*/;
1899 # at #
1900 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-27
1901-/*!100001 SET @@session.gtid_seq_no=27*//*!*/;
1902+/*M!100001 SET @@session.gtid_seq_no=27*//*!*/;
1903 START TRANSACTION
1904 /*!*/;
1905 # at #
1906@@ -838,7 +838,7 @@ COMMIT
1907 /*!*/;
1908 # at #
1909 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-28
1910-/*!100001 SET @@session.gtid_seq_no=28*//*!*/;
1911+/*M!100001 SET @@session.gtid_seq_no=28*//*!*/;
1912 START TRANSACTION
1913 /*!*/;
1914 # at #
1915@@ -859,7 +859,7 @@ COMMIT
1916 /*!*/;
1917 # at #
1918 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-29
1919-/*!100001 SET @@session.gtid_seq_no=29*//*!*/;
1920+/*M!100001 SET @@session.gtid_seq_no=29*//*!*/;
1921 START TRANSACTION
1922 /*!*/;
1923 # at #
1924@@ -882,7 +882,7 @@ COMMIT
1925 /*!*/;
1926 # at #
1927 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-30
1928-/*!100001 SET @@session.gtid_seq_no=30*//*!*/;
1929+/*M!100001 SET @@session.gtid_seq_no=30*//*!*/;
1930 START TRANSACTION
1931 /*!*/;
1932 # at #
1933@@ -903,7 +903,7 @@ COMMIT
1934 /*!*/;
1935 # at #
1936 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-31 ddl
1937-/*!100001 SET @@session.gtid_seq_no=31*//*!*/;
1938+/*M!100001 SET @@session.gtid_seq_no=31*//*!*/;
1939 # at #
1940 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1941 SET TIMESTAMP=1000000000/*!*/;
1942@@ -911,7 +911,7 @@ DROP TABLE `t1` /* generated by server */
1943 /*!*/;
1944 # at #
1945 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-32 ddl
1946-/*!100001 SET @@session.gtid_seq_no=32*//*!*/;
1947+/*M!100001 SET @@session.gtid_seq_no=32*//*!*/;
1948 # at #
1949 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1950 SET TIMESTAMP=1000000000/*!*/;
1951@@ -919,7 +919,7 @@ CREATE TABLE t1 (c04 TINYINT UNSIGNED)
1952 /*!*/;
1953 # at #
1954 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-33
1955-/*!100001 SET @@session.gtid_seq_no=33*//*!*/;
1956+/*M!100001 SET @@session.gtid_seq_no=33*//*!*/;
1957 START TRANSACTION
1958 /*!*/;
1959 # at #
1960@@ -943,7 +943,7 @@ COMMIT
1961 /*!*/;
1962 # at #
1963 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-34
1964-/*!100001 SET @@session.gtid_seq_no=34*//*!*/;
1965+/*M!100001 SET @@session.gtid_seq_no=34*//*!*/;
1966 START TRANSACTION
1967 /*!*/;
1968 # at #
1969@@ -964,7 +964,7 @@ COMMIT
1970 /*!*/;
1971 # at #
1972 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-35 ddl
1973-/*!100001 SET @@session.gtid_seq_no=35*//*!*/;
1974+/*M!100001 SET @@session.gtid_seq_no=35*//*!*/;
1975 # at #
1976 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1977 SET TIMESTAMP=1000000000/*!*/;
1978@@ -972,7 +972,7 @@ DROP TABLE `t1` /* generated by server */
1979 /*!*/;
1980 # at #
1981 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-36 ddl
1982-/*!100001 SET @@session.gtid_seq_no=36*//*!*/;
1983+/*M!100001 SET @@session.gtid_seq_no=36*//*!*/;
1984 # at #
1985 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
1986 SET TIMESTAMP=1000000000/*!*/;
1987@@ -980,7 +980,7 @@ CREATE TABLE t1 (c06 BOOL)
1988 /*!*/;
1989 # at #
1990 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-37
1991-/*!100001 SET @@session.gtid_seq_no=37*//*!*/;
1992+/*M!100001 SET @@session.gtid_seq_no=37*//*!*/;
1993 START TRANSACTION
1994 /*!*/;
1995 # at #
1996@@ -1001,7 +1001,7 @@ COMMIT
1997 /*!*/;
1998 # at #
1999 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-38
2000-/*!100001 SET @@session.gtid_seq_no=38*//*!*/;
2001+/*M!100001 SET @@session.gtid_seq_no=38*//*!*/;
2002 START TRANSACTION
2003 /*!*/;
2004 # at #
2005@@ -1022,7 +1022,7 @@ COMMIT
2006 /*!*/;
2007 # at #
2008 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-39 ddl
2009-/*!100001 SET @@session.gtid_seq_no=39*//*!*/;
2010+/*M!100001 SET @@session.gtid_seq_no=39*//*!*/;
2011 # at #
2012 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2013 SET TIMESTAMP=1000000000/*!*/;
2014@@ -1030,7 +1030,7 @@ DROP TABLE `t1` /* generated by server */
2015 /*!*/;
2016 # at #
2017 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-40 ddl
2018-/*!100001 SET @@session.gtid_seq_no=40*//*!*/;
2019+/*M!100001 SET @@session.gtid_seq_no=40*//*!*/;
2020 # at #
2021 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2022 SET TIMESTAMP=1000000000/*!*/;
2023@@ -1038,7 +1038,7 @@ CREATE TABLE t1 (c07 SMALLINT)
2024 /*!*/;
2025 # at #
2026 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-41
2027-/*!100001 SET @@session.gtid_seq_no=41*//*!*/;
2028+/*M!100001 SET @@session.gtid_seq_no=41*//*!*/;
2029 START TRANSACTION
2030 /*!*/;
2031 # at #
2032@@ -1059,7 +1059,7 @@ COMMIT
2033 /*!*/;
2034 # at #
2035 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-42
2036-/*!100001 SET @@session.gtid_seq_no=42*//*!*/;
2037+/*M!100001 SET @@session.gtid_seq_no=42*//*!*/;
2038 START TRANSACTION
2039 /*!*/;
2040 # at #
2041@@ -1080,7 +1080,7 @@ COMMIT
2042 /*!*/;
2043 # at #
2044 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-43 ddl
2045-/*!100001 SET @@session.gtid_seq_no=43*//*!*/;
2046+/*M!100001 SET @@session.gtid_seq_no=43*//*!*/;
2047 # at #
2048 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2049 SET TIMESTAMP=1000000000/*!*/;
2050@@ -1088,7 +1088,7 @@ DROP TABLE `t1` /* generated by server */
2051 /*!*/;
2052 # at #
2053 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-44 ddl
2054-/*!100001 SET @@session.gtid_seq_no=44*//*!*/;
2055+/*M!100001 SET @@session.gtid_seq_no=44*//*!*/;
2056 # at #
2057 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2058 SET TIMESTAMP=1000000000/*!*/;
2059@@ -1096,7 +1096,7 @@ CREATE TABLE t1 (c08 SMALLINT UNSIGNED)
2060 /*!*/;
2061 # at #
2062 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-45
2063-/*!100001 SET @@session.gtid_seq_no=45*//*!*/;
2064+/*M!100001 SET @@session.gtid_seq_no=45*//*!*/;
2065 START TRANSACTION
2066 /*!*/;
2067 # at #
2068@@ -1120,7 +1120,7 @@ COMMIT
2069 /*!*/;
2070 # at #
2071 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-46
2072-/*!100001 SET @@session.gtid_seq_no=46*//*!*/;
2073+/*M!100001 SET @@session.gtid_seq_no=46*//*!*/;
2074 START TRANSACTION
2075 /*!*/;
2076 # at #
2077@@ -1143,7 +1143,7 @@ COMMIT
2078 /*!*/;
2079 # at #
2080 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-47
2081-/*!100001 SET @@session.gtid_seq_no=47*//*!*/;
2082+/*M!100001 SET @@session.gtid_seq_no=47*//*!*/;
2083 START TRANSACTION
2084 /*!*/;
2085 # at #
2086@@ -1164,7 +1164,7 @@ COMMIT
2087 /*!*/;
2088 # at #
2089 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-48 ddl
2090-/*!100001 SET @@session.gtid_seq_no=48*//*!*/;
2091+/*M!100001 SET @@session.gtid_seq_no=48*//*!*/;
2092 # at #
2093 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2094 SET TIMESTAMP=1000000000/*!*/;
2095@@ -1172,7 +1172,7 @@ DROP TABLE `t1` /* generated by server */
2096 /*!*/;
2097 # at #
2098 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-49 ddl
2099-/*!100001 SET @@session.gtid_seq_no=49*//*!*/;
2100+/*M!100001 SET @@session.gtid_seq_no=49*//*!*/;
2101 # at #
2102 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2103 SET TIMESTAMP=1000000000/*!*/;
2104@@ -1180,7 +1180,7 @@ CREATE TABLE t1 (c10 MEDIUMINT)
2105 /*!*/;
2106 # at #
2107 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-50
2108-/*!100001 SET @@session.gtid_seq_no=50*//*!*/;
2109+/*M!100001 SET @@session.gtid_seq_no=50*//*!*/;
2110 START TRANSACTION
2111 /*!*/;
2112 # at #
2113@@ -1201,7 +1201,7 @@ COMMIT
2114 /*!*/;
2115 # at #
2116 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-51
2117-/*!100001 SET @@session.gtid_seq_no=51*//*!*/;
2118+/*M!100001 SET @@session.gtid_seq_no=51*//*!*/;
2119 START TRANSACTION
2120 /*!*/;
2121 # at #
2122@@ -1222,7 +1222,7 @@ COMMIT
2123 /*!*/;
2124 # at #
2125 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-52 ddl
2126-/*!100001 SET @@session.gtid_seq_no=52*//*!*/;
2127+/*M!100001 SET @@session.gtid_seq_no=52*//*!*/;
2128 # at #
2129 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2130 SET TIMESTAMP=1000000000/*!*/;
2131@@ -1230,7 +1230,7 @@ DROP TABLE `t1` /* generated by server */
2132 /*!*/;
2133 # at #
2134 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-53 ddl
2135-/*!100001 SET @@session.gtid_seq_no=53*//*!*/;
2136+/*M!100001 SET @@session.gtid_seq_no=53*//*!*/;
2137 # at #
2138 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2139 SET TIMESTAMP=1000000000/*!*/;
2140@@ -1238,7 +1238,7 @@ CREATE TABLE t1 (c11 MEDIUMINT UNSIGNED)
2141 /*!*/;
2142 # at #
2143 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-54
2144-/*!100001 SET @@session.gtid_seq_no=54*//*!*/;
2145+/*M!100001 SET @@session.gtid_seq_no=54*//*!*/;
2146 START TRANSACTION
2147 /*!*/;
2148 # at #
2149@@ -1262,7 +1262,7 @@ COMMIT
2150 /*!*/;
2151 # at #
2152 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-55
2153-/*!100001 SET @@session.gtid_seq_no=55*//*!*/;
2154+/*M!100001 SET @@session.gtid_seq_no=55*//*!*/;
2155 START TRANSACTION
2156 /*!*/;
2157 # at #
2158@@ -1285,7 +1285,7 @@ COMMIT
2159 /*!*/;
2160 # at #
2161 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-56
2162-/*!100001 SET @@session.gtid_seq_no=56*//*!*/;
2163+/*M!100001 SET @@session.gtid_seq_no=56*//*!*/;
2164 START TRANSACTION
2165 /*!*/;
2166 # at #
2167@@ -1306,7 +1306,7 @@ COMMIT
2168 /*!*/;
2169 # at #
2170 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-57 ddl
2171-/*!100001 SET @@session.gtid_seq_no=57*//*!*/;
2172+/*M!100001 SET @@session.gtid_seq_no=57*//*!*/;
2173 # at #
2174 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2175 SET TIMESTAMP=1000000000/*!*/;
2176@@ -1314,7 +1314,7 @@ DROP TABLE `t1` /* generated by server */
2177 /*!*/;
2178 # at #
2179 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-58 ddl
2180-/*!100001 SET @@session.gtid_seq_no=58*//*!*/;
2181+/*M!100001 SET @@session.gtid_seq_no=58*//*!*/;
2182 # at #
2183 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2184 SET TIMESTAMP=1000000000/*!*/;
2185@@ -1322,7 +1322,7 @@ CREATE TABLE t1 (c13 INT)
2186 /*!*/;
2187 # at #
2188 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-59
2189-/*!100001 SET @@session.gtid_seq_no=59*//*!*/;
2190+/*M!100001 SET @@session.gtid_seq_no=59*//*!*/;
2191 START TRANSACTION
2192 /*!*/;
2193 # at #
2194@@ -1343,7 +1343,7 @@ COMMIT
2195 /*!*/;
2196 # at #
2197 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-60
2198-/*!100001 SET @@session.gtid_seq_no=60*//*!*/;
2199+/*M!100001 SET @@session.gtid_seq_no=60*//*!*/;
2200 START TRANSACTION
2201 /*!*/;
2202 # at #
2203@@ -1364,7 +1364,7 @@ COMMIT
2204 /*!*/;
2205 # at #
2206 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-61 ddl
2207-/*!100001 SET @@session.gtid_seq_no=61*//*!*/;
2208+/*M!100001 SET @@session.gtid_seq_no=61*//*!*/;
2209 # at #
2210 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2211 SET TIMESTAMP=1000000000/*!*/;
2212@@ -1372,7 +1372,7 @@ DROP TABLE `t1` /* generated by server */
2213 /*!*/;
2214 # at #
2215 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-62 ddl
2216-/*!100001 SET @@session.gtid_seq_no=62*//*!*/;
2217+/*M!100001 SET @@session.gtid_seq_no=62*//*!*/;
2218 # at #
2219 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2220 SET TIMESTAMP=1000000000/*!*/;
2221@@ -1380,7 +1380,7 @@ CREATE TABLE t1 (c14 INT UNSIGNED)
2222 /*!*/;
2223 # at #
2224 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-63
2225-/*!100001 SET @@session.gtid_seq_no=63*//*!*/;
2226+/*M!100001 SET @@session.gtid_seq_no=63*//*!*/;
2227 START TRANSACTION
2228 /*!*/;
2229 # at #
2230@@ -1404,7 +1404,7 @@ COMMIT
2231 /*!*/;
2232 # at #
2233 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-64
2234-/*!100001 SET @@session.gtid_seq_no=64*//*!*/;
2235+/*M!100001 SET @@session.gtid_seq_no=64*//*!*/;
2236 START TRANSACTION
2237 /*!*/;
2238 # at #
2239@@ -1427,7 +1427,7 @@ COMMIT
2240 /*!*/;
2241 # at #
2242 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-65
2243-/*!100001 SET @@session.gtid_seq_no=65*//*!*/;
2244+/*M!100001 SET @@session.gtid_seq_no=65*//*!*/;
2245 START TRANSACTION
2246 /*!*/;
2247 # at #
2248@@ -1448,7 +1448,7 @@ COMMIT
2249 /*!*/;
2250 # at #
2251 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-66 ddl
2252-/*!100001 SET @@session.gtid_seq_no=66*//*!*/;
2253+/*M!100001 SET @@session.gtid_seq_no=66*//*!*/;
2254 # at #
2255 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2256 SET TIMESTAMP=1000000000/*!*/;
2257@@ -1456,7 +1456,7 @@ DROP TABLE `t1` /* generated by server */
2258 /*!*/;
2259 # at #
2260 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-67 ddl
2261-/*!100001 SET @@session.gtid_seq_no=67*//*!*/;
2262+/*M!100001 SET @@session.gtid_seq_no=67*//*!*/;
2263 # at #
2264 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2265 SET TIMESTAMP=1000000000/*!*/;
2266@@ -1464,7 +1464,7 @@ CREATE TABLE t1 (c16 BIGINT)
2267 /*!*/;
2268 # at #
2269 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-68
2270-/*!100001 SET @@session.gtid_seq_no=68*//*!*/;
2271+/*M!100001 SET @@session.gtid_seq_no=68*//*!*/;
2272 START TRANSACTION
2273 /*!*/;
2274 # at #
2275@@ -1485,7 +1485,7 @@ COMMIT
2276 /*!*/;
2277 # at #
2278 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-69
2279-/*!100001 SET @@session.gtid_seq_no=69*//*!*/;
2280+/*M!100001 SET @@session.gtid_seq_no=69*//*!*/;
2281 START TRANSACTION
2282 /*!*/;
2283 # at #
2284@@ -1506,7 +1506,7 @@ COMMIT
2285 /*!*/;
2286 # at #
2287 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-70 ddl
2288-/*!100001 SET @@session.gtid_seq_no=70*//*!*/;
2289+/*M!100001 SET @@session.gtid_seq_no=70*//*!*/;
2290 # at #
2291 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2292 SET TIMESTAMP=1000000000/*!*/;
2293@@ -1514,7 +1514,7 @@ DROP TABLE `t1` /* generated by server */
2294 /*!*/;
2295 # at #
2296 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-71 ddl
2297-/*!100001 SET @@session.gtid_seq_no=71*//*!*/;
2298+/*M!100001 SET @@session.gtid_seq_no=71*//*!*/;
2299 # at #
2300 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2301 SET TIMESTAMP=1000000000/*!*/;
2302@@ -1522,7 +1522,7 @@ CREATE TABLE t1 (c17 BIGINT UNSIGNED)
2303 /*!*/;
2304 # at #
2305 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-72
2306-/*!100001 SET @@session.gtid_seq_no=72*//*!*/;
2307+/*M!100001 SET @@session.gtid_seq_no=72*//*!*/;
2308 START TRANSACTION
2309 /*!*/;
2310 # at #
2311@@ -1546,7 +1546,7 @@ COMMIT
2312 /*!*/;
2313 # at #
2314 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-73
2315-/*!100001 SET @@session.gtid_seq_no=73*//*!*/;
2316+/*M!100001 SET @@session.gtid_seq_no=73*//*!*/;
2317 START TRANSACTION
2318 /*!*/;
2319 # at #
2320@@ -1569,7 +1569,7 @@ COMMIT
2321 /*!*/;
2322 # at #
2323 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-74
2324-/*!100001 SET @@session.gtid_seq_no=74*//*!*/;
2325+/*M!100001 SET @@session.gtid_seq_no=74*//*!*/;
2326 START TRANSACTION
2327 /*!*/;
2328 # at #
2329@@ -1590,7 +1590,7 @@ COMMIT
2330 /*!*/;
2331 # at #
2332 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-75 ddl
2333-/*!100001 SET @@session.gtid_seq_no=75*//*!*/;
2334+/*M!100001 SET @@session.gtid_seq_no=75*//*!*/;
2335 # at #
2336 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2337 SET TIMESTAMP=1000000000/*!*/;
2338@@ -1598,7 +1598,7 @@ DROP TABLE `t1` /* generated by server */
2339 /*!*/;
2340 # at #
2341 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-76 ddl
2342-/*!100001 SET @@session.gtid_seq_no=76*//*!*/;
2343+/*M!100001 SET @@session.gtid_seq_no=76*//*!*/;
2344 # at #
2345 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2346 SET TIMESTAMP=1000000000/*!*/;
2347@@ -1606,7 +1606,7 @@ CREATE TABLE t1 (c19 FLOAT)
2348 /*!*/;
2349 # at #
2350 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-77
2351-/*!100001 SET @@session.gtid_seq_no=77*//*!*/;
2352+/*M!100001 SET @@session.gtid_seq_no=77*//*!*/;
2353 START TRANSACTION
2354 /*!*/;
2355 # at #
2356@@ -1627,7 +1627,7 @@ COMMIT
2357 /*!*/;
2358 # at #
2359 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-78
2360-/*!100001 SET @@session.gtid_seq_no=78*//*!*/;
2361+/*M!100001 SET @@session.gtid_seq_no=78*//*!*/;
2362 START TRANSACTION
2363 /*!*/;
2364 # at #
2365@@ -1648,7 +1648,7 @@ COMMIT
2366 /*!*/;
2367 # at #
2368 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-79 ddl
2369-/*!100001 SET @@session.gtid_seq_no=79*//*!*/;
2370+/*M!100001 SET @@session.gtid_seq_no=79*//*!*/;
2371 # at #
2372 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2373 SET TIMESTAMP=1000000000/*!*/;
2374@@ -1656,7 +1656,7 @@ DROP TABLE `t1` /* generated by server */
2375 /*!*/;
2376 # at #
2377 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-80 ddl
2378-/*!100001 SET @@session.gtid_seq_no=80*//*!*/;
2379+/*M!100001 SET @@session.gtid_seq_no=80*//*!*/;
2380 # at #
2381 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2382 SET TIMESTAMP=1000000000/*!*/;
2383@@ -1664,7 +1664,7 @@ CREATE TABLE t1 (c22 DOUBLE)
2384 /*!*/;
2385 # at #
2386 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-81
2387-/*!100001 SET @@session.gtid_seq_no=81*//*!*/;
2388+/*M!100001 SET @@session.gtid_seq_no=81*//*!*/;
2389 START TRANSACTION
2390 /*!*/;
2391 # at #
2392@@ -1685,7 +1685,7 @@ COMMIT
2393 /*!*/;
2394 # at #
2395 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-82
2396-/*!100001 SET @@session.gtid_seq_no=82*//*!*/;
2397+/*M!100001 SET @@session.gtid_seq_no=82*//*!*/;
2398 START TRANSACTION
2399 /*!*/;
2400 # at #
2401@@ -1706,7 +1706,7 @@ COMMIT
2402 /*!*/;
2403 # at #
2404 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-83 ddl
2405-/*!100001 SET @@session.gtid_seq_no=83*//*!*/;
2406+/*M!100001 SET @@session.gtid_seq_no=83*//*!*/;
2407 # at #
2408 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2409 SET TIMESTAMP=1000000000/*!*/;
2410@@ -1714,7 +1714,7 @@ DROP TABLE `t1` /* generated by server */
2411 /*!*/;
2412 # at #
2413 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-84 ddl
2414-/*!100001 SET @@session.gtid_seq_no=84*//*!*/;
2415+/*M!100001 SET @@session.gtid_seq_no=84*//*!*/;
2416 # at #
2417 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2418 SET TIMESTAMP=1000000000/*!*/;
2419@@ -1722,7 +1722,7 @@ CREATE TABLE t1 (c25 DECIMAL(10,5))
2420 /*!*/;
2421 # at #
2422 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-85
2423-/*!100001 SET @@session.gtid_seq_no=85*//*!*/;
2424+/*M!100001 SET @@session.gtid_seq_no=85*//*!*/;
2425 START TRANSACTION
2426 /*!*/;
2427 # at #
2428@@ -1743,7 +1743,7 @@ COMMIT
2429 /*!*/;
2430 # at #
2431 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-86
2432-/*!100001 SET @@session.gtid_seq_no=86*//*!*/;
2433+/*M!100001 SET @@session.gtid_seq_no=86*//*!*/;
2434 START TRANSACTION
2435 /*!*/;
2436 # at #
2437@@ -1764,7 +1764,7 @@ COMMIT
2438 /*!*/;
2439 # at #
2440 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-87
2441-/*!100001 SET @@session.gtid_seq_no=87*//*!*/;
2442+/*M!100001 SET @@session.gtid_seq_no=87*//*!*/;
2443 START TRANSACTION
2444 /*!*/;
2445 # at #
2446@@ -1785,7 +1785,7 @@ COMMIT
2447 /*!*/;
2448 # at #
2449 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-88 ddl
2450-/*!100001 SET @@session.gtid_seq_no=88*//*!*/;
2451+/*M!100001 SET @@session.gtid_seq_no=88*//*!*/;
2452 # at #
2453 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2454 SET TIMESTAMP=1000000000/*!*/;
2455@@ -1793,7 +1793,7 @@ DROP TABLE `t1` /* generated by server */
2456 /*!*/;
2457 # at #
2458 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-89 ddl
2459-/*!100001 SET @@session.gtid_seq_no=89*//*!*/;
2460+/*M!100001 SET @@session.gtid_seq_no=89*//*!*/;
2461 # at #
2462 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2463 SET TIMESTAMP=1000000000/*!*/;
2464@@ -1801,7 +1801,7 @@ CREATE TABLE t1 (c28 DATE)
2465 /*!*/;
2466 # at #
2467 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-90
2468-/*!100001 SET @@session.gtid_seq_no=90*//*!*/;
2469+/*M!100001 SET @@session.gtid_seq_no=90*//*!*/;
2470 START TRANSACTION
2471 /*!*/;
2472 # at #
2473@@ -1822,7 +1822,7 @@ COMMIT
2474 /*!*/;
2475 # at #
2476 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-91
2477-/*!100001 SET @@session.gtid_seq_no=91*//*!*/;
2478+/*M!100001 SET @@session.gtid_seq_no=91*//*!*/;
2479 START TRANSACTION
2480 /*!*/;
2481 # at #
2482@@ -1843,7 +1843,7 @@ COMMIT
2483 /*!*/;
2484 # at #
2485 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-92 ddl
2486-/*!100001 SET @@session.gtid_seq_no=92*//*!*/;
2487+/*M!100001 SET @@session.gtid_seq_no=92*//*!*/;
2488 # at #
2489 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2490 SET TIMESTAMP=1000000000/*!*/;
2491@@ -1851,7 +1851,7 @@ DROP TABLE `t1` /* generated by server */
2492 /*!*/;
2493 # at #
2494 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-93 ddl
2495-/*!100001 SET @@session.gtid_seq_no=93*//*!*/;
2496+/*M!100001 SET @@session.gtid_seq_no=93*//*!*/;
2497 # at #
2498 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2499 SET TIMESTAMP=1000000000/*!*/;
2500@@ -1859,7 +1859,7 @@ CREATE TABLE t1 (c29 DATETIME)
2501 /*!*/;
2502 # at #
2503 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-94
2504-/*!100001 SET @@session.gtid_seq_no=94*//*!*/;
2505+/*M!100001 SET @@session.gtid_seq_no=94*//*!*/;
2506 START TRANSACTION
2507 /*!*/;
2508 # at #
2509@@ -1880,7 +1880,7 @@ COMMIT
2510 /*!*/;
2511 # at #
2512 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-95
2513-/*!100001 SET @@session.gtid_seq_no=95*//*!*/;
2514+/*M!100001 SET @@session.gtid_seq_no=95*//*!*/;
2515 START TRANSACTION
2516 /*!*/;
2517 # at #
2518@@ -1901,7 +1901,7 @@ COMMIT
2519 /*!*/;
2520 # at #
2521 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-96 ddl
2522-/*!100001 SET @@session.gtid_seq_no=96*//*!*/;
2523+/*M!100001 SET @@session.gtid_seq_no=96*//*!*/;
2524 # at #
2525 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2526 SET TIMESTAMP=1000000000/*!*/;
2527@@ -1909,7 +1909,7 @@ DROP TABLE `t1` /* generated by server */
2528 /*!*/;
2529 # at #
2530 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-97 ddl
2531-/*!100001 SET @@session.gtid_seq_no=97*//*!*/;
2532+/*M!100001 SET @@session.gtid_seq_no=97*//*!*/;
2533 # at #
2534 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2535 SET TIMESTAMP=1000000000/*!*/;
2536@@ -1917,7 +1917,7 @@ CREATE TABLE t1 (c30 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURR
2537 /*!*/;
2538 # at #
2539 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-98
2540-/*!100001 SET @@session.gtid_seq_no=98*//*!*/;
2541+/*M!100001 SET @@session.gtid_seq_no=98*//*!*/;
2542 START TRANSACTION
2543 /*!*/;
2544 # at #
2545@@ -1939,7 +1939,7 @@ COMMIT
2546 /*!*/;
2547 # at #
2548 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-99
2549-/*!100001 SET @@session.gtid_seq_no=99*//*!*/;
2550+/*M!100001 SET @@session.gtid_seq_no=99*//*!*/;
2551 START TRANSACTION
2552 /*!*/;
2553 # at #
2554@@ -1960,7 +1960,7 @@ COMMIT
2555 /*!*/;
2556 # at #
2557 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-100 ddl
2558-/*!100001 SET @@session.gtid_seq_no=100*//*!*/;
2559+/*M!100001 SET @@session.gtid_seq_no=100*//*!*/;
2560 # at #
2561 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2562 SET TIMESTAMP=1000000000/*!*/;
2563@@ -1968,7 +1968,7 @@ DROP TABLE `t1` /* generated by server */
2564 /*!*/;
2565 # at #
2566 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-101 ddl
2567-/*!100001 SET @@session.gtid_seq_no=101*//*!*/;
2568+/*M!100001 SET @@session.gtid_seq_no=101*//*!*/;
2569 # at #
2570 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2571 SET TIMESTAMP=1000000000/*!*/;
2572@@ -1976,7 +1976,7 @@ CREATE TABLE t1 (c31 TIME)
2573 /*!*/;
2574 # at #
2575 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-102
2576-/*!100001 SET @@session.gtid_seq_no=102*//*!*/;
2577+/*M!100001 SET @@session.gtid_seq_no=102*//*!*/;
2578 START TRANSACTION
2579 /*!*/;
2580 # at #
2581@@ -1997,7 +1997,7 @@ COMMIT
2582 /*!*/;
2583 # at #
2584 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-103
2585-/*!100001 SET @@session.gtid_seq_no=103*//*!*/;
2586+/*M!100001 SET @@session.gtid_seq_no=103*//*!*/;
2587 START TRANSACTION
2588 /*!*/;
2589 # at #
2590@@ -2018,7 +2018,7 @@ COMMIT
2591 /*!*/;
2592 # at #
2593 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-104 ddl
2594-/*!100001 SET @@session.gtid_seq_no=104*//*!*/;
2595+/*M!100001 SET @@session.gtid_seq_no=104*//*!*/;
2596 # at #
2597 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2598 SET TIMESTAMP=1000000000/*!*/;
2599@@ -2026,7 +2026,7 @@ DROP TABLE `t1` /* generated by server */
2600 /*!*/;
2601 # at #
2602 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-105 ddl
2603-/*!100001 SET @@session.gtid_seq_no=105*//*!*/;
2604+/*M!100001 SET @@session.gtid_seq_no=105*//*!*/;
2605 # at #
2606 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2607 SET TIMESTAMP=1000000000/*!*/;
2608@@ -2034,7 +2034,7 @@ CREATE TABLE t1 (c32 YEAR)
2609 /*!*/;
2610 # at #
2611 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-106
2612-/*!100001 SET @@session.gtid_seq_no=106*//*!*/;
2613+/*M!100001 SET @@session.gtid_seq_no=106*//*!*/;
2614 START TRANSACTION
2615 /*!*/;
2616 # at #
2617@@ -2055,7 +2055,7 @@ COMMIT
2618 /*!*/;
2619 # at #
2620 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-107
2621-/*!100001 SET @@session.gtid_seq_no=107*//*!*/;
2622+/*M!100001 SET @@session.gtid_seq_no=107*//*!*/;
2623 START TRANSACTION
2624 /*!*/;
2625 # at #
2626@@ -2076,7 +2076,7 @@ COMMIT
2627 /*!*/;
2628 # at #
2629 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-108 ddl
2630-/*!100001 SET @@session.gtid_seq_no=108*//*!*/;
2631+/*M!100001 SET @@session.gtid_seq_no=108*//*!*/;
2632 # at #
2633 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2634 SET TIMESTAMP=1000000000/*!*/;
2635@@ -2084,7 +2084,7 @@ DROP TABLE `t1` /* generated by server */
2636 /*!*/;
2637 # at #
2638 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-109 ddl
2639-/*!100001 SET @@session.gtid_seq_no=109*//*!*/;
2640+/*M!100001 SET @@session.gtid_seq_no=109*//*!*/;
2641 # at #
2642 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2643 SET TIMESTAMP=1000000000/*!*/;
2644@@ -2092,7 +2092,7 @@ CREATE TABLE t1 (c33 CHAR)
2645 /*!*/;
2646 # at #
2647 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-110
2648-/*!100001 SET @@session.gtid_seq_no=110*//*!*/;
2649+/*M!100001 SET @@session.gtid_seq_no=110*//*!*/;
2650 START TRANSACTION
2651 /*!*/;
2652 # at #
2653@@ -2113,7 +2113,7 @@ COMMIT
2654 /*!*/;
2655 # at #
2656 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-111
2657-/*!100001 SET @@session.gtid_seq_no=111*//*!*/;
2658+/*M!100001 SET @@session.gtid_seq_no=111*//*!*/;
2659 START TRANSACTION
2660 /*!*/;
2661 # at #
2662@@ -2134,7 +2134,7 @@ COMMIT
2663 /*!*/;
2664 # at #
2665 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-112 ddl
2666-/*!100001 SET @@session.gtid_seq_no=112*//*!*/;
2667+/*M!100001 SET @@session.gtid_seq_no=112*//*!*/;
2668 # at #
2669 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2670 SET TIMESTAMP=1000000000/*!*/;
2671@@ -2142,7 +2142,7 @@ DROP TABLE `t1` /* generated by server */
2672 /*!*/;
2673 # at #
2674 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-113 ddl
2675-/*!100001 SET @@session.gtid_seq_no=113*//*!*/;
2676+/*M!100001 SET @@session.gtid_seq_no=113*//*!*/;
2677 # at #
2678 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2679 SET TIMESTAMP=1000000000/*!*/;
2680@@ -2150,7 +2150,7 @@ CREATE TABLE t1 (c34 CHAR(0))
2681 /*!*/;
2682 # at #
2683 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-114
2684-/*!100001 SET @@session.gtid_seq_no=114*//*!*/;
2685+/*M!100001 SET @@session.gtid_seq_no=114*//*!*/;
2686 START TRANSACTION
2687 /*!*/;
2688 # at #
2689@@ -2171,7 +2171,7 @@ COMMIT
2690 /*!*/;
2691 # at #
2692 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-115
2693-/*!100001 SET @@session.gtid_seq_no=115*//*!*/;
2694+/*M!100001 SET @@session.gtid_seq_no=115*//*!*/;
2695 START TRANSACTION
2696 /*!*/;
2697 # at #
2698@@ -2192,7 +2192,7 @@ COMMIT
2699 /*!*/;
2700 # at #
2701 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-116 ddl
2702-/*!100001 SET @@session.gtid_seq_no=116*//*!*/;
2703+/*M!100001 SET @@session.gtid_seq_no=116*//*!*/;
2704 # at #
2705 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2706 SET TIMESTAMP=1000000000/*!*/;
2707@@ -2200,7 +2200,7 @@ DROP TABLE `t1` /* generated by server */
2708 /*!*/;
2709 # at #
2710 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-117 ddl
2711-/*!100001 SET @@session.gtid_seq_no=117*//*!*/;
2712+/*M!100001 SET @@session.gtid_seq_no=117*//*!*/;
2713 # at #
2714 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2715 SET TIMESTAMP=1000000000/*!*/;
2716@@ -2208,7 +2208,7 @@ CREATE TABLE t1 (c35 CHAR(1))
2717 /*!*/;
2718 # at #
2719 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-118
2720-/*!100001 SET @@session.gtid_seq_no=118*//*!*/;
2721+/*M!100001 SET @@session.gtid_seq_no=118*//*!*/;
2722 START TRANSACTION
2723 /*!*/;
2724 # at #
2725@@ -2229,7 +2229,7 @@ COMMIT
2726 /*!*/;
2727 # at #
2728 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-119
2729-/*!100001 SET @@session.gtid_seq_no=119*//*!*/;
2730+/*M!100001 SET @@session.gtid_seq_no=119*//*!*/;
2731 START TRANSACTION
2732 /*!*/;
2733 # at #
2734@@ -2250,7 +2250,7 @@ COMMIT
2735 /*!*/;
2736 # at #
2737 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-120 ddl
2738-/*!100001 SET @@session.gtid_seq_no=120*//*!*/;
2739+/*M!100001 SET @@session.gtid_seq_no=120*//*!*/;
2740 # at #
2741 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2742 SET TIMESTAMP=1000000000/*!*/;
2743@@ -2258,7 +2258,7 @@ DROP TABLE `t1` /* generated by server */
2744 /*!*/;
2745 # at #
2746 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-121 ddl
2747-/*!100001 SET @@session.gtid_seq_no=121*//*!*/;
2748+/*M!100001 SET @@session.gtid_seq_no=121*//*!*/;
2749 # at #
2750 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2751 SET TIMESTAMP=1000000000/*!*/;
2752@@ -2266,7 +2266,7 @@ CREATE TABLE t1 (c36 CHAR(255))
2753 /*!*/;
2754 # at #
2755 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-122
2756-/*!100001 SET @@session.gtid_seq_no=122*//*!*/;
2757+/*M!100001 SET @@session.gtid_seq_no=122*//*!*/;
2758 START TRANSACTION
2759 /*!*/;
2760 # at #
2761@@ -2287,7 +2287,7 @@ COMMIT
2762 /*!*/;
2763 # at #
2764 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-123
2765-/*!100001 SET @@session.gtid_seq_no=123*//*!*/;
2766+/*M!100001 SET @@session.gtid_seq_no=123*//*!*/;
2767 START TRANSACTION
2768 /*!*/;
2769 # at #
2770@@ -2308,7 +2308,7 @@ COMMIT
2771 /*!*/;
2772 # at #
2773 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-124 ddl
2774-/*!100001 SET @@session.gtid_seq_no=124*//*!*/;
2775+/*M!100001 SET @@session.gtid_seq_no=124*//*!*/;
2776 # at #
2777 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2778 SET TIMESTAMP=1000000000/*!*/;
2779@@ -2316,7 +2316,7 @@ DROP TABLE `t1` /* generated by server */
2780 /*!*/;
2781 # at #
2782 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-125 ddl
2783-/*!100001 SET @@session.gtid_seq_no=125*//*!*/;
2784+/*M!100001 SET @@session.gtid_seq_no=125*//*!*/;
2785 # at #
2786 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2787 SET TIMESTAMP=1000000000/*!*/;
2788@@ -2324,7 +2324,7 @@ CREATE TABLE t1 (c37 NATIONAL CHAR)
2789 /*!*/;
2790 # at #
2791 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-126
2792-/*!100001 SET @@session.gtid_seq_no=126*//*!*/;
2793+/*M!100001 SET @@session.gtid_seq_no=126*//*!*/;
2794 START TRANSACTION
2795 /*!*/;
2796 # at #
2797@@ -2345,7 +2345,7 @@ COMMIT
2798 /*!*/;
2799 # at #
2800 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-127
2801-/*!100001 SET @@session.gtid_seq_no=127*//*!*/;
2802+/*M!100001 SET @@session.gtid_seq_no=127*//*!*/;
2803 START TRANSACTION
2804 /*!*/;
2805 # at #
2806@@ -2366,7 +2366,7 @@ COMMIT
2807 /*!*/;
2808 # at #
2809 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-128 ddl
2810-/*!100001 SET @@session.gtid_seq_no=128*//*!*/;
2811+/*M!100001 SET @@session.gtid_seq_no=128*//*!*/;
2812 # at #
2813 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2814 SET TIMESTAMP=1000000000/*!*/;
2815@@ -2374,7 +2374,7 @@ DROP TABLE `t1` /* generated by server */
2816 /*!*/;
2817 # at #
2818 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-129 ddl
2819-/*!100001 SET @@session.gtid_seq_no=129*//*!*/;
2820+/*M!100001 SET @@session.gtid_seq_no=129*//*!*/;
2821 # at #
2822 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2823 SET TIMESTAMP=1000000000/*!*/;
2824@@ -2382,7 +2382,7 @@ CREATE TABLE t1 (c38 NATIONAL CHAR(0))
2825 /*!*/;
2826 # at #
2827 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-130
2828-/*!100001 SET @@session.gtid_seq_no=130*//*!*/;
2829+/*M!100001 SET @@session.gtid_seq_no=130*//*!*/;
2830 START TRANSACTION
2831 /*!*/;
2832 # at #
2833@@ -2403,7 +2403,7 @@ COMMIT
2834 /*!*/;
2835 # at #
2836 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-131
2837-/*!100001 SET @@session.gtid_seq_no=131*//*!*/;
2838+/*M!100001 SET @@session.gtid_seq_no=131*//*!*/;
2839 START TRANSACTION
2840 /*!*/;
2841 # at #
2842@@ -2424,7 +2424,7 @@ COMMIT
2843 /*!*/;
2844 # at #
2845 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-132 ddl
2846-/*!100001 SET @@session.gtid_seq_no=132*//*!*/;
2847+/*M!100001 SET @@session.gtid_seq_no=132*//*!*/;
2848 # at #
2849 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2850 SET TIMESTAMP=1000000000/*!*/;
2851@@ -2432,7 +2432,7 @@ DROP TABLE `t1` /* generated by server */
2852 /*!*/;
2853 # at #
2854 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-133 ddl
2855-/*!100001 SET @@session.gtid_seq_no=133*//*!*/;
2856+/*M!100001 SET @@session.gtid_seq_no=133*//*!*/;
2857 # at #
2858 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2859 SET TIMESTAMP=1000000000/*!*/;
2860@@ -2440,7 +2440,7 @@ CREATE TABLE t1 (c39 NATIONAL CHAR(1))
2861 /*!*/;
2862 # at #
2863 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-134
2864-/*!100001 SET @@session.gtid_seq_no=134*//*!*/;
2865+/*M!100001 SET @@session.gtid_seq_no=134*//*!*/;
2866 START TRANSACTION
2867 /*!*/;
2868 # at #
2869@@ -2461,7 +2461,7 @@ COMMIT
2870 /*!*/;
2871 # at #
2872 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-135
2873-/*!100001 SET @@session.gtid_seq_no=135*//*!*/;
2874+/*M!100001 SET @@session.gtid_seq_no=135*//*!*/;
2875 START TRANSACTION
2876 /*!*/;
2877 # at #
2878@@ -2482,7 +2482,7 @@ COMMIT
2879 /*!*/;
2880 # at #
2881 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-136 ddl
2882-/*!100001 SET @@session.gtid_seq_no=136*//*!*/;
2883+/*M!100001 SET @@session.gtid_seq_no=136*//*!*/;
2884 # at #
2885 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2886 SET TIMESTAMP=1000000000/*!*/;
2887@@ -2490,7 +2490,7 @@ DROP TABLE `t1` /* generated by server */
2888 /*!*/;
2889 # at #
2890 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-137 ddl
2891-/*!100001 SET @@session.gtid_seq_no=137*//*!*/;
2892+/*M!100001 SET @@session.gtid_seq_no=137*//*!*/;
2893 # at #
2894 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2895 SET TIMESTAMP=1000000000/*!*/;
2896@@ -2498,7 +2498,7 @@ CREATE TABLE t1 (c40 NATIONAL CHAR(255))
2897 /*!*/;
2898 # at #
2899 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-138
2900-/*!100001 SET @@session.gtid_seq_no=138*//*!*/;
2901+/*M!100001 SET @@session.gtid_seq_no=138*//*!*/;
2902 START TRANSACTION
2903 /*!*/;
2904 # at #
2905@@ -2519,7 +2519,7 @@ COMMIT
2906 /*!*/;
2907 # at #
2908 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-139
2909-/*!100001 SET @@session.gtid_seq_no=139*//*!*/;
2910+/*M!100001 SET @@session.gtid_seq_no=139*//*!*/;
2911 START TRANSACTION
2912 /*!*/;
2913 # at #
2914@@ -2540,7 +2540,7 @@ COMMIT
2915 /*!*/;
2916 # at #
2917 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-140
2918-/*!100001 SET @@session.gtid_seq_no=140*//*!*/;
2919+/*M!100001 SET @@session.gtid_seq_no=140*//*!*/;
2920 START TRANSACTION
2921 /*!*/;
2922 # at #
2923@@ -2564,7 +2564,7 @@ COMMIT
2924 /*!*/;
2925 # at #
2926 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-141 ddl
2927-/*!100001 SET @@session.gtid_seq_no=141*//*!*/;
2928+/*M!100001 SET @@session.gtid_seq_no=141*//*!*/;
2929 # at #
2930 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2931 SET TIMESTAMP=1000000000/*!*/;
2932@@ -2572,7 +2572,7 @@ DROP TABLE `t1` /* generated by server */
2933 /*!*/;
2934 # at #
2935 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-142 ddl
2936-/*!100001 SET @@session.gtid_seq_no=142*//*!*/;
2937+/*M!100001 SET @@session.gtid_seq_no=142*//*!*/;
2938 # at #
2939 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2940 SET TIMESTAMP=1000000000/*!*/;
2941@@ -2580,7 +2580,7 @@ CREATE TABLE t1 (c41 CHAR CHARACTER SET UCS2)
2942 /*!*/;
2943 # at #
2944 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-143
2945-/*!100001 SET @@session.gtid_seq_no=143*//*!*/;
2946+/*M!100001 SET @@session.gtid_seq_no=143*//*!*/;
2947 START TRANSACTION
2948 /*!*/;
2949 # at #
2950@@ -2601,7 +2601,7 @@ COMMIT
2951 /*!*/;
2952 # at #
2953 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-144
2954-/*!100001 SET @@session.gtid_seq_no=144*//*!*/;
2955+/*M!100001 SET @@session.gtid_seq_no=144*//*!*/;
2956 START TRANSACTION
2957 /*!*/;
2958 # at #
2959@@ -2622,7 +2622,7 @@ COMMIT
2960 /*!*/;
2961 # at #
2962 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-145 ddl
2963-/*!100001 SET @@session.gtid_seq_no=145*//*!*/;
2964+/*M!100001 SET @@session.gtid_seq_no=145*//*!*/;
2965 # at #
2966 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2967 SET TIMESTAMP=1000000000/*!*/;
2968@@ -2630,7 +2630,7 @@ DROP TABLE `t1` /* generated by server */
2969 /*!*/;
2970 # at #
2971 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-146 ddl
2972-/*!100001 SET @@session.gtid_seq_no=146*//*!*/;
2973+/*M!100001 SET @@session.gtid_seq_no=146*//*!*/;
2974 # at #
2975 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
2976 SET TIMESTAMP=1000000000/*!*/;
2977@@ -2638,7 +2638,7 @@ CREATE TABLE t1 (c42 CHAR(0) CHARACTER SET UCS2)
2978 /*!*/;
2979 # at #
2980 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-147
2981-/*!100001 SET @@session.gtid_seq_no=147*//*!*/;
2982+/*M!100001 SET @@session.gtid_seq_no=147*//*!*/;
2983 START TRANSACTION
2984 /*!*/;
2985 # at #
2986@@ -2659,7 +2659,7 @@ COMMIT
2987 /*!*/;
2988 # at #
2989 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-148
2990-/*!100001 SET @@session.gtid_seq_no=148*//*!*/;
2991+/*M!100001 SET @@session.gtid_seq_no=148*//*!*/;
2992 START TRANSACTION
2993 /*!*/;
2994 # at #
2995@@ -2680,7 +2680,7 @@ COMMIT
2996 /*!*/;
2997 # at #
2998 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-149 ddl
2999-/*!100001 SET @@session.gtid_seq_no=149*//*!*/;
3000+/*M!100001 SET @@session.gtid_seq_no=149*//*!*/;
3001 # at #
3002 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3003 SET TIMESTAMP=1000000000/*!*/;
3004@@ -2688,7 +2688,7 @@ DROP TABLE `t1` /* generated by server */
3005 /*!*/;
3006 # at #
3007 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-150 ddl
3008-/*!100001 SET @@session.gtid_seq_no=150*//*!*/;
3009+/*M!100001 SET @@session.gtid_seq_no=150*//*!*/;
3010 # at #
3011 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3012 SET TIMESTAMP=1000000000/*!*/;
3013@@ -2696,7 +2696,7 @@ CREATE TABLE t1 (c43 CHAR(1) CHARACTER SET UCS2)
3014 /*!*/;
3015 # at #
3016 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-151
3017-/*!100001 SET @@session.gtid_seq_no=151*//*!*/;
3018+/*M!100001 SET @@session.gtid_seq_no=151*//*!*/;
3019 START TRANSACTION
3020 /*!*/;
3021 # at #
3022@@ -2717,7 +2717,7 @@ COMMIT
3023 /*!*/;
3024 # at #
3025 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-152
3026-/*!100001 SET @@session.gtid_seq_no=152*//*!*/;
3027+/*M!100001 SET @@session.gtid_seq_no=152*//*!*/;
3028 START TRANSACTION
3029 /*!*/;
3030 # at #
3031@@ -2738,7 +2738,7 @@ COMMIT
3032 /*!*/;
3033 # at #
3034 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-153 ddl
3035-/*!100001 SET @@session.gtid_seq_no=153*//*!*/;
3036+/*M!100001 SET @@session.gtid_seq_no=153*//*!*/;
3037 # at #
3038 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3039 SET TIMESTAMP=1000000000/*!*/;
3040@@ -2746,7 +2746,7 @@ DROP TABLE `t1` /* generated by server */
3041 /*!*/;
3042 # at #
3043 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-154 ddl
3044-/*!100001 SET @@session.gtid_seq_no=154*//*!*/;
3045+/*M!100001 SET @@session.gtid_seq_no=154*//*!*/;
3046 # at #
3047 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3048 SET TIMESTAMP=1000000000/*!*/;
3049@@ -2754,7 +2754,7 @@ CREATE TABLE t1 (c44 CHAR(255) CHARACTER SET UCS2)
3050 /*!*/;
3051 # at #
3052 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-155
3053-/*!100001 SET @@session.gtid_seq_no=155*//*!*/;
3054+/*M!100001 SET @@session.gtid_seq_no=155*//*!*/;
3055 START TRANSACTION
3056 /*!*/;
3057 # at #
3058@@ -2775,7 +2775,7 @@ COMMIT
3059 /*!*/;
3060 # at #
3061 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-156
3062-/*!100001 SET @@session.gtid_seq_no=156*//*!*/;
3063+/*M!100001 SET @@session.gtid_seq_no=156*//*!*/;
3064 START TRANSACTION
3065 /*!*/;
3066 # at #
3067@@ -2796,7 +2796,7 @@ COMMIT
3068 /*!*/;
3069 # at #
3070 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-157
3071-/*!100001 SET @@session.gtid_seq_no=157*//*!*/;
3072+/*M!100001 SET @@session.gtid_seq_no=157*//*!*/;
3073 START TRANSACTION
3074 /*!*/;
3075 # at #
3076@@ -2820,7 +2820,7 @@ COMMIT
3077 /*!*/;
3078 # at #
3079 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-158 ddl
3080-/*!100001 SET @@session.gtid_seq_no=158*//*!*/;
3081+/*M!100001 SET @@session.gtid_seq_no=158*//*!*/;
3082 # at #
3083 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3084 SET TIMESTAMP=1000000000/*!*/;
3085@@ -2828,7 +2828,7 @@ DROP TABLE `t1` /* generated by server */
3086 /*!*/;
3087 # at #
3088 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-159 ddl
3089-/*!100001 SET @@session.gtid_seq_no=159*//*!*/;
3090+/*M!100001 SET @@session.gtid_seq_no=159*//*!*/;
3091 # at #
3092 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3093 SET TIMESTAMP=1000000000/*!*/;
3094@@ -2836,7 +2836,7 @@ CREATE TABLE t1 (c45 VARCHAR(0))
3095 /*!*/;
3096 # at #
3097 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-160
3098-/*!100001 SET @@session.gtid_seq_no=160*//*!*/;
3099+/*M!100001 SET @@session.gtid_seq_no=160*//*!*/;
3100 START TRANSACTION
3101 /*!*/;
3102 # at #
3103@@ -2857,7 +2857,7 @@ COMMIT
3104 /*!*/;
3105 # at #
3106 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-161
3107-/*!100001 SET @@session.gtid_seq_no=161*//*!*/;
3108+/*M!100001 SET @@session.gtid_seq_no=161*//*!*/;
3109 START TRANSACTION
3110 /*!*/;
3111 # at #
3112@@ -2878,7 +2878,7 @@ COMMIT
3113 /*!*/;
3114 # at #
3115 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-162 ddl
3116-/*!100001 SET @@session.gtid_seq_no=162*//*!*/;
3117+/*M!100001 SET @@session.gtid_seq_no=162*//*!*/;
3118 # at #
3119 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3120 SET TIMESTAMP=1000000000/*!*/;
3121@@ -2886,7 +2886,7 @@ DROP TABLE `t1` /* generated by server */
3122 /*!*/;
3123 # at #
3124 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-163 ddl
3125-/*!100001 SET @@session.gtid_seq_no=163*//*!*/;
3126+/*M!100001 SET @@session.gtid_seq_no=163*//*!*/;
3127 # at #
3128 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3129 SET TIMESTAMP=1000000000/*!*/;
3130@@ -2894,7 +2894,7 @@ CREATE TABLE t1 (c46 VARCHAR(1))
3131 /*!*/;
3132 # at #
3133 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-164
3134-/*!100001 SET @@session.gtid_seq_no=164*//*!*/;
3135+/*M!100001 SET @@session.gtid_seq_no=164*//*!*/;
3136 START TRANSACTION
3137 /*!*/;
3138 # at #
3139@@ -2915,7 +2915,7 @@ COMMIT
3140 /*!*/;
3141 # at #
3142 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-165
3143-/*!100001 SET @@session.gtid_seq_no=165*//*!*/;
3144+/*M!100001 SET @@session.gtid_seq_no=165*//*!*/;
3145 START TRANSACTION
3146 /*!*/;
3147 # at #
3148@@ -2936,7 +2936,7 @@ COMMIT
3149 /*!*/;
3150 # at #
3151 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-166 ddl
3152-/*!100001 SET @@session.gtid_seq_no=166*//*!*/;
3153+/*M!100001 SET @@session.gtid_seq_no=166*//*!*/;
3154 # at #
3155 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3156 SET TIMESTAMP=1000000000/*!*/;
3157@@ -2944,7 +2944,7 @@ DROP TABLE `t1` /* generated by server */
3158 /*!*/;
3159 # at #
3160 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-167 ddl
3161-/*!100001 SET @@session.gtid_seq_no=167*//*!*/;
3162+/*M!100001 SET @@session.gtid_seq_no=167*//*!*/;
3163 # at #
3164 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3165 SET TIMESTAMP=1000000000/*!*/;
3166@@ -2952,7 +2952,7 @@ CREATE TABLE t1 (c47 VARCHAR(255))
3167 /*!*/;
3168 # at #
3169 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-168
3170-/*!100001 SET @@session.gtid_seq_no=168*//*!*/;
3171+/*M!100001 SET @@session.gtid_seq_no=168*//*!*/;
3172 START TRANSACTION
3173 /*!*/;
3174 # at #
3175@@ -2973,7 +2973,7 @@ COMMIT
3176 /*!*/;
3177 # at #
3178 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-169
3179-/*!100001 SET @@session.gtid_seq_no=169*//*!*/;
3180+/*M!100001 SET @@session.gtid_seq_no=169*//*!*/;
3181 START TRANSACTION
3182 /*!*/;
3183 # at #
3184@@ -2994,7 +2994,7 @@ COMMIT
3185 /*!*/;
3186 # at #
3187 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-170 ddl
3188-/*!100001 SET @@session.gtid_seq_no=170*//*!*/;
3189+/*M!100001 SET @@session.gtid_seq_no=170*//*!*/;
3190 # at #
3191 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3192 SET TIMESTAMP=1000000000/*!*/;
3193@@ -3002,7 +3002,7 @@ DROP TABLE `t1` /* generated by server */
3194 /*!*/;
3195 # at #
3196 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-171 ddl
3197-/*!100001 SET @@session.gtid_seq_no=171*//*!*/;
3198+/*M!100001 SET @@session.gtid_seq_no=171*//*!*/;
3199 # at #
3200 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3201 SET TIMESTAMP=1000000000/*!*/;
3202@@ -3010,7 +3010,7 @@ CREATE TABLE t1 (c48 VARCHAR(261))
3203 /*!*/;
3204 # at #
3205 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-172
3206-/*!100001 SET @@session.gtid_seq_no=172*//*!*/;
3207+/*M!100001 SET @@session.gtid_seq_no=172*//*!*/;
3208 START TRANSACTION
3209 /*!*/;
3210 # at #
3211@@ -3031,7 +3031,7 @@ COMMIT
3212 /*!*/;
3213 # at #
3214 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-173
3215-/*!100001 SET @@session.gtid_seq_no=173*//*!*/;
3216+/*M!100001 SET @@session.gtid_seq_no=173*//*!*/;
3217 START TRANSACTION
3218 /*!*/;
3219 # at #
3220@@ -3052,7 +3052,7 @@ COMMIT
3221 /*!*/;
3222 # at #
3223 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-174 ddl
3224-/*!100001 SET @@session.gtid_seq_no=174*//*!*/;
3225+/*M!100001 SET @@session.gtid_seq_no=174*//*!*/;
3226 # at #
3227 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3228 SET TIMESTAMP=1000000000/*!*/;
3229@@ -3060,7 +3060,7 @@ DROP TABLE `t1` /* generated by server */
3230 /*!*/;
3231 # at #
3232 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-175 ddl
3233-/*!100001 SET @@session.gtid_seq_no=175*//*!*/;
3234+/*M!100001 SET @@session.gtid_seq_no=175*//*!*/;
3235 # at #
3236 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3237 SET TIMESTAMP=1000000000/*!*/;
3238@@ -3068,7 +3068,7 @@ CREATE TABLE t1 (c49 NATIONAL VARCHAR(0))
3239 /*!*/;
3240 # at #
3241 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-176
3242-/*!100001 SET @@session.gtid_seq_no=176*//*!*/;
3243+/*M!100001 SET @@session.gtid_seq_no=176*//*!*/;
3244 START TRANSACTION
3245 /*!*/;
3246 # at #
3247@@ -3089,7 +3089,7 @@ COMMIT
3248 /*!*/;
3249 # at #
3250 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-177
3251-/*!100001 SET @@session.gtid_seq_no=177*//*!*/;
3252+/*M!100001 SET @@session.gtid_seq_no=177*//*!*/;
3253 START TRANSACTION
3254 /*!*/;
3255 # at #
3256@@ -3110,7 +3110,7 @@ COMMIT
3257 /*!*/;
3258 # at #
3259 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-178 ddl
3260-/*!100001 SET @@session.gtid_seq_no=178*//*!*/;
3261+/*M!100001 SET @@session.gtid_seq_no=178*//*!*/;
3262 # at #
3263 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3264 SET TIMESTAMP=1000000000/*!*/;
3265@@ -3118,7 +3118,7 @@ DROP TABLE `t1` /* generated by server */
3266 /*!*/;
3267 # at #
3268 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-179 ddl
3269-/*!100001 SET @@session.gtid_seq_no=179*//*!*/;
3270+/*M!100001 SET @@session.gtid_seq_no=179*//*!*/;
3271 # at #
3272 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3273 SET TIMESTAMP=1000000000/*!*/;
3274@@ -3126,7 +3126,7 @@ CREATE TABLE t1 (c50 NATIONAL VARCHAR(1))
3275 /*!*/;
3276 # at #
3277 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-180
3278-/*!100001 SET @@session.gtid_seq_no=180*//*!*/;
3279+/*M!100001 SET @@session.gtid_seq_no=180*//*!*/;
3280 START TRANSACTION
3281 /*!*/;
3282 # at #
3283@@ -3147,7 +3147,7 @@ COMMIT
3284 /*!*/;
3285 # at #
3286 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-181
3287-/*!100001 SET @@session.gtid_seq_no=181*//*!*/;
3288+/*M!100001 SET @@session.gtid_seq_no=181*//*!*/;
3289 START TRANSACTION
3290 /*!*/;
3291 # at #
3292@@ -3168,7 +3168,7 @@ COMMIT
3293 /*!*/;
3294 # at #
3295 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-182 ddl
3296-/*!100001 SET @@session.gtid_seq_no=182*//*!*/;
3297+/*M!100001 SET @@session.gtid_seq_no=182*//*!*/;
3298 # at #
3299 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3300 SET TIMESTAMP=1000000000/*!*/;
3301@@ -3176,7 +3176,7 @@ DROP TABLE `t1` /* generated by server */
3302 /*!*/;
3303 # at #
3304 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-183 ddl
3305-/*!100001 SET @@session.gtid_seq_no=183*//*!*/;
3306+/*M!100001 SET @@session.gtid_seq_no=183*//*!*/;
3307 # at #
3308 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3309 SET TIMESTAMP=1000000000/*!*/;
3310@@ -3184,7 +3184,7 @@ CREATE TABLE t1 (c51 NATIONAL VARCHAR(255))
3311 /*!*/;
3312 # at #
3313 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-184
3314-/*!100001 SET @@session.gtid_seq_no=184*//*!*/;
3315+/*M!100001 SET @@session.gtid_seq_no=184*//*!*/;
3316 START TRANSACTION
3317 /*!*/;
3318 # at #
3319@@ -3205,7 +3205,7 @@ COMMIT
3320 /*!*/;
3321 # at #
3322 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-185
3323-/*!100001 SET @@session.gtid_seq_no=185*//*!*/;
3324+/*M!100001 SET @@session.gtid_seq_no=185*//*!*/;
3325 START TRANSACTION
3326 /*!*/;
3327 # at #
3328@@ -3226,7 +3226,7 @@ COMMIT
3329 /*!*/;
3330 # at #
3331 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-186
3332-/*!100001 SET @@session.gtid_seq_no=186*//*!*/;
3333+/*M!100001 SET @@session.gtid_seq_no=186*//*!*/;
3334 START TRANSACTION
3335 /*!*/;
3336 # at #
3337@@ -3250,7 +3250,7 @@ COMMIT
3338 /*!*/;
3339 # at #
3340 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-187 ddl
3341-/*!100001 SET @@session.gtid_seq_no=187*//*!*/;
3342+/*M!100001 SET @@session.gtid_seq_no=187*//*!*/;
3343 # at #
3344 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3345 SET TIMESTAMP=1000000000/*!*/;
3346@@ -3258,7 +3258,7 @@ DROP TABLE `t1` /* generated by server */
3347 /*!*/;
3348 # at #
3349 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-188 ddl
3350-/*!100001 SET @@session.gtid_seq_no=188*//*!*/;
3351+/*M!100001 SET @@session.gtid_seq_no=188*//*!*/;
3352 # at #
3353 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3354 SET TIMESTAMP=1000000000/*!*/;
3355@@ -3266,7 +3266,7 @@ CREATE TABLE t1 (c52 NATIONAL VARCHAR(261))
3356 /*!*/;
3357 # at #
3358 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-189
3359-/*!100001 SET @@session.gtid_seq_no=189*//*!*/;
3360+/*M!100001 SET @@session.gtid_seq_no=189*//*!*/;
3361 START TRANSACTION
3362 /*!*/;
3363 # at #
3364@@ -3287,7 +3287,7 @@ COMMIT
3365 /*!*/;
3366 # at #
3367 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-190
3368-/*!100001 SET @@session.gtid_seq_no=190*//*!*/;
3369+/*M!100001 SET @@session.gtid_seq_no=190*//*!*/;
3370 START TRANSACTION
3371 /*!*/;
3372 # at #
3373@@ -3308,7 +3308,7 @@ COMMIT
3374 /*!*/;
3375 # at #
3376 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-191
3377-/*!100001 SET @@session.gtid_seq_no=191*//*!*/;
3378+/*M!100001 SET @@session.gtid_seq_no=191*//*!*/;
3379 START TRANSACTION
3380 /*!*/;
3381 # at #
3382@@ -3332,7 +3332,7 @@ COMMIT
3383 /*!*/;
3384 # at #
3385 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-192 ddl
3386-/*!100001 SET @@session.gtid_seq_no=192*//*!*/;
3387+/*M!100001 SET @@session.gtid_seq_no=192*//*!*/;
3388 # at #
3389 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3390 SET TIMESTAMP=1000000000/*!*/;
3391@@ -3340,7 +3340,7 @@ DROP TABLE `t1` /* generated by server */
3392 /*!*/;
3393 # at #
3394 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-193 ddl
3395-/*!100001 SET @@session.gtid_seq_no=193*//*!*/;
3396+/*M!100001 SET @@session.gtid_seq_no=193*//*!*/;
3397 # at #
3398 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3399 SET TIMESTAMP=1000000000/*!*/;
3400@@ -3348,7 +3348,7 @@ CREATE TABLE t1 (c53 VARCHAR(0) CHARACTER SET ucs2)
3401 /*!*/;
3402 # at #
3403 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-194
3404-/*!100001 SET @@session.gtid_seq_no=194*//*!*/;
3405+/*M!100001 SET @@session.gtid_seq_no=194*//*!*/;
3406 START TRANSACTION
3407 /*!*/;
3408 # at #
3409@@ -3369,7 +3369,7 @@ COMMIT
3410 /*!*/;
3411 # at #
3412 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-195
3413-/*!100001 SET @@session.gtid_seq_no=195*//*!*/;
3414+/*M!100001 SET @@session.gtid_seq_no=195*//*!*/;
3415 START TRANSACTION
3416 /*!*/;
3417 # at #
3418@@ -3390,7 +3390,7 @@ COMMIT
3419 /*!*/;
3420 # at #
3421 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-196 ddl
3422-/*!100001 SET @@session.gtid_seq_no=196*//*!*/;
3423+/*M!100001 SET @@session.gtid_seq_no=196*//*!*/;
3424 # at #
3425 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3426 SET TIMESTAMP=1000000000/*!*/;
3427@@ -3398,7 +3398,7 @@ DROP TABLE `t1` /* generated by server */
3428 /*!*/;
3429 # at #
3430 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-197 ddl
3431-/*!100001 SET @@session.gtid_seq_no=197*//*!*/;
3432+/*M!100001 SET @@session.gtid_seq_no=197*//*!*/;
3433 # at #
3434 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3435 SET TIMESTAMP=1000000000/*!*/;
3436@@ -3406,7 +3406,7 @@ CREATE TABLE t1 (c54 VARCHAR(1) CHARACTER SET ucs2)
3437 /*!*/;
3438 # at #
3439 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-198
3440-/*!100001 SET @@session.gtid_seq_no=198*//*!*/;
3441+/*M!100001 SET @@session.gtid_seq_no=198*//*!*/;
3442 START TRANSACTION
3443 /*!*/;
3444 # at #
3445@@ -3427,7 +3427,7 @@ COMMIT
3446 /*!*/;
3447 # at #
3448 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-199
3449-/*!100001 SET @@session.gtid_seq_no=199*//*!*/;
3450+/*M!100001 SET @@session.gtid_seq_no=199*//*!*/;
3451 START TRANSACTION
3452 /*!*/;
3453 # at #
3454@@ -3448,7 +3448,7 @@ COMMIT
3455 /*!*/;
3456 # at #
3457 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-200 ddl
3458-/*!100001 SET @@session.gtid_seq_no=200*//*!*/;
3459+/*M!100001 SET @@session.gtid_seq_no=200*//*!*/;
3460 # at #
3461 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3462 SET TIMESTAMP=1000000000/*!*/;
3463@@ -3456,7 +3456,7 @@ DROP TABLE `t1` /* generated by server */
3464 /*!*/;
3465 # at #
3466 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-201 ddl
3467-/*!100001 SET @@session.gtid_seq_no=201*//*!*/;
3468+/*M!100001 SET @@session.gtid_seq_no=201*//*!*/;
3469 # at #
3470 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3471 SET TIMESTAMP=1000000000/*!*/;
3472@@ -3464,7 +3464,7 @@ CREATE TABLE t1 (c55 VARCHAR(255) CHARACTER SET ucs2)
3473 /*!*/;
3474 # at #
3475 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-202
3476-/*!100001 SET @@session.gtid_seq_no=202*//*!*/;
3477+/*M!100001 SET @@session.gtid_seq_no=202*//*!*/;
3478 START TRANSACTION
3479 /*!*/;
3480 # at #
3481@@ -3485,7 +3485,7 @@ COMMIT
3482 /*!*/;
3483 # at #
3484 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-203
3485-/*!100001 SET @@session.gtid_seq_no=203*//*!*/;
3486+/*M!100001 SET @@session.gtid_seq_no=203*//*!*/;
3487 START TRANSACTION
3488 /*!*/;
3489 # at #
3490@@ -3506,7 +3506,7 @@ COMMIT
3491 /*!*/;
3492 # at #
3493 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-204 ddl
3494-/*!100001 SET @@session.gtid_seq_no=204*//*!*/;
3495+/*M!100001 SET @@session.gtid_seq_no=204*//*!*/;
3496 # at #
3497 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3498 SET TIMESTAMP=1000000000/*!*/;
3499@@ -3514,7 +3514,7 @@ DROP TABLE `t1` /* generated by server */
3500 /*!*/;
3501 # at #
3502 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-205 ddl
3503-/*!100001 SET @@session.gtid_seq_no=205*//*!*/;
3504+/*M!100001 SET @@session.gtid_seq_no=205*//*!*/;
3505 # at #
3506 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3507 SET TIMESTAMP=1000000000/*!*/;
3508@@ -3522,7 +3522,7 @@ CREATE TABLE t1 (c56 VARCHAR(261) CHARACTER SET ucs2)
3509 /*!*/;
3510 # at #
3511 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-206
3512-/*!100001 SET @@session.gtid_seq_no=206*//*!*/;
3513+/*M!100001 SET @@session.gtid_seq_no=206*//*!*/;
3514 START TRANSACTION
3515 /*!*/;
3516 # at #
3517@@ -3543,7 +3543,7 @@ COMMIT
3518 /*!*/;
3519 # at #
3520 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-207
3521-/*!100001 SET @@session.gtid_seq_no=207*//*!*/;
3522+/*M!100001 SET @@session.gtid_seq_no=207*//*!*/;
3523 START TRANSACTION
3524 /*!*/;
3525 # at #
3526@@ -3564,7 +3564,7 @@ COMMIT
3527 /*!*/;
3528 # at #
3529 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-208 ddl
3530-/*!100001 SET @@session.gtid_seq_no=208*//*!*/;
3531+/*M!100001 SET @@session.gtid_seq_no=208*//*!*/;
3532 # at #
3533 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3534 SET TIMESTAMP=1000000000/*!*/;
3535@@ -3572,7 +3572,7 @@ DROP TABLE `t1` /* generated by server */
3536 /*!*/;
3537 # at #
3538 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-209 ddl
3539-/*!100001 SET @@session.gtid_seq_no=209*//*!*/;
3540+/*M!100001 SET @@session.gtid_seq_no=209*//*!*/;
3541 # at #
3542 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3543 SET TIMESTAMP=1000000000/*!*/;
3544@@ -3580,7 +3580,7 @@ CREATE TABLE t1 (c57 BINARY)
3545 /*!*/;
3546 # at #
3547 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-210
3548-/*!100001 SET @@session.gtid_seq_no=210*//*!*/;
3549+/*M!100001 SET @@session.gtid_seq_no=210*//*!*/;
3550 START TRANSACTION
3551 /*!*/;
3552 # at #
3553@@ -3601,7 +3601,7 @@ COMMIT
3554 /*!*/;
3555 # at #
3556 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-211
3557-/*!100001 SET @@session.gtid_seq_no=211*//*!*/;
3558+/*M!100001 SET @@session.gtid_seq_no=211*//*!*/;
3559 START TRANSACTION
3560 /*!*/;
3561 # at #
3562@@ -3622,7 +3622,7 @@ COMMIT
3563 /*!*/;
3564 # at #
3565 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-212
3566-/*!100001 SET @@session.gtid_seq_no=212*//*!*/;
3567+/*M!100001 SET @@session.gtid_seq_no=212*//*!*/;
3568 START TRANSACTION
3569 /*!*/;
3570 # at #
3571@@ -3643,7 +3643,7 @@ COMMIT
3572 /*!*/;
3573 # at #
3574 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-213
3575-/*!100001 SET @@session.gtid_seq_no=213*//*!*/;
3576+/*M!100001 SET @@session.gtid_seq_no=213*//*!*/;
3577 START TRANSACTION
3578 /*!*/;
3579 # at #
3580@@ -3664,7 +3664,7 @@ COMMIT
3581 /*!*/;
3582 # at #
3583 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-214 ddl
3584-/*!100001 SET @@session.gtid_seq_no=214*//*!*/;
3585+/*M!100001 SET @@session.gtid_seq_no=214*//*!*/;
3586 # at #
3587 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3588 SET TIMESTAMP=1000000000/*!*/;
3589@@ -3672,7 +3672,7 @@ DROP TABLE `t1` /* generated by server */
3590 /*!*/;
3591 # at #
3592 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-215 ddl
3593-/*!100001 SET @@session.gtid_seq_no=215*//*!*/;
3594+/*M!100001 SET @@session.gtid_seq_no=215*//*!*/;
3595 # at #
3596 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3597 SET TIMESTAMP=1000000000/*!*/;
3598@@ -3680,7 +3680,7 @@ CREATE TABLE t1 (c58 BINARY(0))
3599 /*!*/;
3600 # at #
3601 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-216
3602-/*!100001 SET @@session.gtid_seq_no=216*//*!*/;
3603+/*M!100001 SET @@session.gtid_seq_no=216*//*!*/;
3604 START TRANSACTION
3605 /*!*/;
3606 # at #
3607@@ -3701,7 +3701,7 @@ COMMIT
3608 /*!*/;
3609 # at #
3610 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-217
3611-/*!100001 SET @@session.gtid_seq_no=217*//*!*/;
3612+/*M!100001 SET @@session.gtid_seq_no=217*//*!*/;
3613 START TRANSACTION
3614 /*!*/;
3615 # at #
3616@@ -3722,7 +3722,7 @@ COMMIT
3617 /*!*/;
3618 # at #
3619 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-218 ddl
3620-/*!100001 SET @@session.gtid_seq_no=218*//*!*/;
3621+/*M!100001 SET @@session.gtid_seq_no=218*//*!*/;
3622 # at #
3623 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3624 SET TIMESTAMP=1000000000/*!*/;
3625@@ -3730,7 +3730,7 @@ DROP TABLE `t1` /* generated by server */
3626 /*!*/;
3627 # at #
3628 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-219 ddl
3629-/*!100001 SET @@session.gtid_seq_no=219*//*!*/;
3630+/*M!100001 SET @@session.gtid_seq_no=219*//*!*/;
3631 # at #
3632 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3633 SET TIMESTAMP=1000000000/*!*/;
3634@@ -3738,7 +3738,7 @@ CREATE TABLE t1 (c59 BINARY(1))
3635 /*!*/;
3636 # at #
3637 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-220
3638-/*!100001 SET @@session.gtid_seq_no=220*//*!*/;
3639+/*M!100001 SET @@session.gtid_seq_no=220*//*!*/;
3640 START TRANSACTION
3641 /*!*/;
3642 # at #
3643@@ -3759,7 +3759,7 @@ COMMIT
3644 /*!*/;
3645 # at #
3646 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-221
3647-/*!100001 SET @@session.gtid_seq_no=221*//*!*/;
3648+/*M!100001 SET @@session.gtid_seq_no=221*//*!*/;
3649 START TRANSACTION
3650 /*!*/;
3651 # at #
3652@@ -3780,7 +3780,7 @@ COMMIT
3653 /*!*/;
3654 # at #
3655 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-222
3656-/*!100001 SET @@session.gtid_seq_no=222*//*!*/;
3657+/*M!100001 SET @@session.gtid_seq_no=222*//*!*/;
3658 START TRANSACTION
3659 /*!*/;
3660 # at #
3661@@ -3801,7 +3801,7 @@ COMMIT
3662 /*!*/;
3663 # at #
3664 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-223
3665-/*!100001 SET @@session.gtid_seq_no=223*//*!*/;
3666+/*M!100001 SET @@session.gtid_seq_no=223*//*!*/;
3667 START TRANSACTION
3668 /*!*/;
3669 # at #
3670@@ -3822,7 +3822,7 @@ COMMIT
3671 /*!*/;
3672 # at #
3673 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-224 ddl
3674-/*!100001 SET @@session.gtid_seq_no=224*//*!*/;
3675+/*M!100001 SET @@session.gtid_seq_no=224*//*!*/;
3676 # at #
3677 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3678 SET TIMESTAMP=1000000000/*!*/;
3679@@ -3830,7 +3830,7 @@ DROP TABLE `t1` /* generated by server */
3680 /*!*/;
3681 # at #
3682 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-225 ddl
3683-/*!100001 SET @@session.gtid_seq_no=225*//*!*/;
3684+/*M!100001 SET @@session.gtid_seq_no=225*//*!*/;
3685 # at #
3686 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3687 SET TIMESTAMP=1000000000/*!*/;
3688@@ -3838,7 +3838,7 @@ CREATE TABLE t1 (c60 BINARY(255))
3689 /*!*/;
3690 # at #
3691 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-226
3692-/*!100001 SET @@session.gtid_seq_no=226*//*!*/;
3693+/*M!100001 SET @@session.gtid_seq_no=226*//*!*/;
3694 START TRANSACTION
3695 /*!*/;
3696 # at #
3697@@ -3859,7 +3859,7 @@ COMMIT
3698 /*!*/;
3699 # at #
3700 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-227
3701-/*!100001 SET @@session.gtid_seq_no=227*//*!*/;
3702+/*M!100001 SET @@session.gtid_seq_no=227*//*!*/;
3703 START TRANSACTION
3704 /*!*/;
3705 # at #
3706@@ -3880,7 +3880,7 @@ COMMIT
3707 /*!*/;
3708 # at #
3709 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-228
3710-/*!100001 SET @@session.gtid_seq_no=228*//*!*/;
3711+/*M!100001 SET @@session.gtid_seq_no=228*//*!*/;
3712 START TRANSACTION
3713 /*!*/;
3714 # at #
3715@@ -3901,7 +3901,7 @@ COMMIT
3716 /*!*/;
3717 # at #
3718 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-229
3719-/*!100001 SET @@session.gtid_seq_no=229*//*!*/;
3720+/*M!100001 SET @@session.gtid_seq_no=229*//*!*/;
3721 START TRANSACTION
3722 /*!*/;
3723 # at #
3724@@ -3922,7 +3922,7 @@ COMMIT
3725 /*!*/;
3726 # at #
3727 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-230 ddl
3728-/*!100001 SET @@session.gtid_seq_no=230*//*!*/;
3729+/*M!100001 SET @@session.gtid_seq_no=230*//*!*/;
3730 # at #
3731 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3732 SET TIMESTAMP=1000000000/*!*/;
3733@@ -3930,7 +3930,7 @@ DROP TABLE `t1` /* generated by server */
3734 /*!*/;
3735 # at #
3736 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-231 ddl
3737-/*!100001 SET @@session.gtid_seq_no=231*//*!*/;
3738+/*M!100001 SET @@session.gtid_seq_no=231*//*!*/;
3739 # at #
3740 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3741 SET TIMESTAMP=1000000000/*!*/;
3742@@ -3938,7 +3938,7 @@ CREATE TABLE t1 (c61 VARBINARY(0))
3743 /*!*/;
3744 # at #
3745 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-232
3746-/*!100001 SET @@session.gtid_seq_no=232*//*!*/;
3747+/*M!100001 SET @@session.gtid_seq_no=232*//*!*/;
3748 START TRANSACTION
3749 /*!*/;
3750 # at #
3751@@ -3959,7 +3959,7 @@ COMMIT
3752 /*!*/;
3753 # at #
3754 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-233
3755-/*!100001 SET @@session.gtid_seq_no=233*//*!*/;
3756+/*M!100001 SET @@session.gtid_seq_no=233*//*!*/;
3757 START TRANSACTION
3758 /*!*/;
3759 # at #
3760@@ -3980,7 +3980,7 @@ COMMIT
3761 /*!*/;
3762 # at #
3763 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-234 ddl
3764-/*!100001 SET @@session.gtid_seq_no=234*//*!*/;
3765+/*M!100001 SET @@session.gtid_seq_no=234*//*!*/;
3766 # at #
3767 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3768 SET TIMESTAMP=1000000000/*!*/;
3769@@ -3988,7 +3988,7 @@ DROP TABLE `t1` /* generated by server */
3770 /*!*/;
3771 # at #
3772 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-235 ddl
3773-/*!100001 SET @@session.gtid_seq_no=235*//*!*/;
3774+/*M!100001 SET @@session.gtid_seq_no=235*//*!*/;
3775 # at #
3776 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3777 SET TIMESTAMP=1000000000/*!*/;
3778@@ -3996,7 +3996,7 @@ CREATE TABLE t1 (c62 VARBINARY(1))
3779 /*!*/;
3780 # at #
3781 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-236
3782-/*!100001 SET @@session.gtid_seq_no=236*//*!*/;
3783+/*M!100001 SET @@session.gtid_seq_no=236*//*!*/;
3784 START TRANSACTION
3785 /*!*/;
3786 # at #
3787@@ -4017,7 +4017,7 @@ COMMIT
3788 /*!*/;
3789 # at #
3790 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-237
3791-/*!100001 SET @@session.gtid_seq_no=237*//*!*/;
3792+/*M!100001 SET @@session.gtid_seq_no=237*//*!*/;
3793 START TRANSACTION
3794 /*!*/;
3795 # at #
3796@@ -4038,7 +4038,7 @@ COMMIT
3797 /*!*/;
3798 # at #
3799 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-238
3800-/*!100001 SET @@session.gtid_seq_no=238*//*!*/;
3801+/*M!100001 SET @@session.gtid_seq_no=238*//*!*/;
3802 START TRANSACTION
3803 /*!*/;
3804 # at #
3805@@ -4059,7 +4059,7 @@ COMMIT
3806 /*!*/;
3807 # at #
3808 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-239
3809-/*!100001 SET @@session.gtid_seq_no=239*//*!*/;
3810+/*M!100001 SET @@session.gtid_seq_no=239*//*!*/;
3811 START TRANSACTION
3812 /*!*/;
3813 # at #
3814@@ -4080,7 +4080,7 @@ COMMIT
3815 /*!*/;
3816 # at #
3817 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-240 ddl
3818-/*!100001 SET @@session.gtid_seq_no=240*//*!*/;
3819+/*M!100001 SET @@session.gtid_seq_no=240*//*!*/;
3820 # at #
3821 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3822 SET TIMESTAMP=1000000000/*!*/;
3823@@ -4088,7 +4088,7 @@ DROP TABLE `t1` /* generated by server */
3824 /*!*/;
3825 # at #
3826 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-241 ddl
3827-/*!100001 SET @@session.gtid_seq_no=241*//*!*/;
3828+/*M!100001 SET @@session.gtid_seq_no=241*//*!*/;
3829 # at #
3830 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3831 SET TIMESTAMP=1000000000/*!*/;
3832@@ -4096,7 +4096,7 @@ CREATE TABLE t1 (c63 VARBINARY(255))
3833 /*!*/;
3834 # at #
3835 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-242
3836-/*!100001 SET @@session.gtid_seq_no=242*//*!*/;
3837+/*M!100001 SET @@session.gtid_seq_no=242*//*!*/;
3838 START TRANSACTION
3839 /*!*/;
3840 # at #
3841@@ -4117,7 +4117,7 @@ COMMIT
3842 /*!*/;
3843 # at #
3844 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-243
3845-/*!100001 SET @@session.gtid_seq_no=243*//*!*/;
3846+/*M!100001 SET @@session.gtid_seq_no=243*//*!*/;
3847 START TRANSACTION
3848 /*!*/;
3849 # at #
3850@@ -4138,7 +4138,7 @@ COMMIT
3851 /*!*/;
3852 # at #
3853 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-244
3854-/*!100001 SET @@session.gtid_seq_no=244*//*!*/;
3855+/*M!100001 SET @@session.gtid_seq_no=244*//*!*/;
3856 START TRANSACTION
3857 /*!*/;
3858 # at #
3859@@ -4159,7 +4159,7 @@ COMMIT
3860 /*!*/;
3861 # at #
3862 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-245
3863-/*!100001 SET @@session.gtid_seq_no=245*//*!*/;
3864+/*M!100001 SET @@session.gtid_seq_no=245*//*!*/;
3865 START TRANSACTION
3866 /*!*/;
3867 # at #
3868@@ -4180,7 +4180,7 @@ COMMIT
3869 /*!*/;
3870 # at #
3871 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-246 ddl
3872-/*!100001 SET @@session.gtid_seq_no=246*//*!*/;
3873+/*M!100001 SET @@session.gtid_seq_no=246*//*!*/;
3874 # at #
3875 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3876 SET TIMESTAMP=1000000000/*!*/;
3877@@ -4188,7 +4188,7 @@ DROP TABLE `t1` /* generated by server */
3878 /*!*/;
3879 # at #
3880 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-247 ddl
3881-/*!100001 SET @@session.gtid_seq_no=247*//*!*/;
3882+/*M!100001 SET @@session.gtid_seq_no=247*//*!*/;
3883 # at #
3884 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3885 SET TIMESTAMP=1000000000/*!*/;
3886@@ -4196,7 +4196,7 @@ CREATE TABLE t1 (c65 TINYBLOB)
3887 /*!*/;
3888 # at #
3889 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-248
3890-/*!100001 SET @@session.gtid_seq_no=248*//*!*/;
3891+/*M!100001 SET @@session.gtid_seq_no=248*//*!*/;
3892 START TRANSACTION
3893 /*!*/;
3894 # at #
3895@@ -4217,7 +4217,7 @@ COMMIT
3896 /*!*/;
3897 # at #
3898 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-249
3899-/*!100001 SET @@session.gtid_seq_no=249*//*!*/;
3900+/*M!100001 SET @@session.gtid_seq_no=249*//*!*/;
3901 START TRANSACTION
3902 /*!*/;
3903 # at #
3904@@ -4238,7 +4238,7 @@ COMMIT
3905 /*!*/;
3906 # at #
3907 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-250 ddl
3908-/*!100001 SET @@session.gtid_seq_no=250*//*!*/;
3909+/*M!100001 SET @@session.gtid_seq_no=250*//*!*/;
3910 # at #
3911 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3912 SET TIMESTAMP=1000000000/*!*/;
3913@@ -4246,7 +4246,7 @@ DROP TABLE `t1` /* generated by server */
3914 /*!*/;
3915 # at #
3916 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-251 ddl
3917-/*!100001 SET @@session.gtid_seq_no=251*//*!*/;
3918+/*M!100001 SET @@session.gtid_seq_no=251*//*!*/;
3919 # at #
3920 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3921 SET TIMESTAMP=1000000000/*!*/;
3922@@ -4254,7 +4254,7 @@ CREATE TABLE t1 (c68 BLOB)
3923 /*!*/;
3924 # at #
3925 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-252
3926-/*!100001 SET @@session.gtid_seq_no=252*//*!*/;
3927+/*M!100001 SET @@session.gtid_seq_no=252*//*!*/;
3928 START TRANSACTION
3929 /*!*/;
3930 # at #
3931@@ -4275,7 +4275,7 @@ COMMIT
3932 /*!*/;
3933 # at #
3934 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-253
3935-/*!100001 SET @@session.gtid_seq_no=253*//*!*/;
3936+/*M!100001 SET @@session.gtid_seq_no=253*//*!*/;
3937 START TRANSACTION
3938 /*!*/;
3939 # at #
3940@@ -4296,7 +4296,7 @@ COMMIT
3941 /*!*/;
3942 # at #
3943 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-254 ddl
3944-/*!100001 SET @@session.gtid_seq_no=254*//*!*/;
3945+/*M!100001 SET @@session.gtid_seq_no=254*//*!*/;
3946 # at #
3947 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3948 SET TIMESTAMP=1000000000/*!*/;
3949@@ -4304,7 +4304,7 @@ DROP TABLE `t1` /* generated by server */
3950 /*!*/;
3951 # at #
3952 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-255 ddl
3953-/*!100001 SET @@session.gtid_seq_no=255*//*!*/;
3954+/*M!100001 SET @@session.gtid_seq_no=255*//*!*/;
3955 # at #
3956 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3957 SET TIMESTAMP=1000000000/*!*/;
3958@@ -4312,7 +4312,7 @@ CREATE TABLE t1 (c71 MEDIUMBLOB)
3959 /*!*/;
3960 # at #
3961 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-256
3962-/*!100001 SET @@session.gtid_seq_no=256*//*!*/;
3963+/*M!100001 SET @@session.gtid_seq_no=256*//*!*/;
3964 START TRANSACTION
3965 /*!*/;
3966 # at #
3967@@ -4333,7 +4333,7 @@ COMMIT
3968 /*!*/;
3969 # at #
3970 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-257
3971-/*!100001 SET @@session.gtid_seq_no=257*//*!*/;
3972+/*M!100001 SET @@session.gtid_seq_no=257*//*!*/;
3973 START TRANSACTION
3974 /*!*/;
3975 # at #
3976@@ -4354,7 +4354,7 @@ COMMIT
3977 /*!*/;
3978 # at #
3979 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-258 ddl
3980-/*!100001 SET @@session.gtid_seq_no=258*//*!*/;
3981+/*M!100001 SET @@session.gtid_seq_no=258*//*!*/;
3982 # at #
3983 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3984 SET TIMESTAMP=1000000000/*!*/;
3985@@ -4362,7 +4362,7 @@ DROP TABLE `t1` /* generated by server */
3986 /*!*/;
3987 # at #
3988 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-259 ddl
3989-/*!100001 SET @@session.gtid_seq_no=259*//*!*/;
3990+/*M!100001 SET @@session.gtid_seq_no=259*//*!*/;
3991 # at #
3992 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
3993 SET TIMESTAMP=1000000000/*!*/;
3994@@ -4370,7 +4370,7 @@ CREATE TABLE t1 (c74 LONGBLOB)
3995 /*!*/;
3996 # at #
3997 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-260
3998-/*!100001 SET @@session.gtid_seq_no=260*//*!*/;
3999+/*M!100001 SET @@session.gtid_seq_no=260*//*!*/;
4000 START TRANSACTION
4001 /*!*/;
4002 # at #
4003@@ -4391,7 +4391,7 @@ COMMIT
4004 /*!*/;
4005 # at #
4006 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-261
4007-/*!100001 SET @@session.gtid_seq_no=261*//*!*/;
4008+/*M!100001 SET @@session.gtid_seq_no=261*//*!*/;
4009 START TRANSACTION
4010 /*!*/;
4011 # at #
4012@@ -4412,7 +4412,7 @@ COMMIT
4013 /*!*/;
4014 # at #
4015 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-262 ddl
4016-/*!100001 SET @@session.gtid_seq_no=262*//*!*/;
4017+/*M!100001 SET @@session.gtid_seq_no=262*//*!*/;
4018 # at #
4019 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4020 SET TIMESTAMP=1000000000/*!*/;
4021@@ -4420,7 +4420,7 @@ DROP TABLE `t1` /* generated by server */
4022 /*!*/;
4023 # at #
4024 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-263 ddl
4025-/*!100001 SET @@session.gtid_seq_no=263*//*!*/;
4026+/*M!100001 SET @@session.gtid_seq_no=263*//*!*/;
4027 # at #
4028 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4029 SET TIMESTAMP=1000000000/*!*/;
4030@@ -4428,7 +4428,7 @@ CREATE TABLE t1 (c66 TINYTEXT)
4031 /*!*/;
4032 # at #
4033 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-264
4034-/*!100001 SET @@session.gtid_seq_no=264*//*!*/;
4035+/*M!100001 SET @@session.gtid_seq_no=264*//*!*/;
4036 START TRANSACTION
4037 /*!*/;
4038 # at #
4039@@ -4449,7 +4449,7 @@ COMMIT
4040 /*!*/;
4041 # at #
4042 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-265
4043-/*!100001 SET @@session.gtid_seq_no=265*//*!*/;
4044+/*M!100001 SET @@session.gtid_seq_no=265*//*!*/;
4045 START TRANSACTION
4046 /*!*/;
4047 # at #
4048@@ -4470,7 +4470,7 @@ COMMIT
4049 /*!*/;
4050 # at #
4051 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-266 ddl
4052-/*!100001 SET @@session.gtid_seq_no=266*//*!*/;
4053+/*M!100001 SET @@session.gtid_seq_no=266*//*!*/;
4054 # at #
4055 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4056 SET TIMESTAMP=1000000000/*!*/;
4057@@ -4478,7 +4478,7 @@ DROP TABLE `t1` /* generated by server */
4058 /*!*/;
4059 # at #
4060 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-267 ddl
4061-/*!100001 SET @@session.gtid_seq_no=267*//*!*/;
4062+/*M!100001 SET @@session.gtid_seq_no=267*//*!*/;
4063 # at #
4064 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4065 SET TIMESTAMP=1000000000/*!*/;
4066@@ -4486,7 +4486,7 @@ CREATE TABLE t1 (c69 TEXT)
4067 /*!*/;
4068 # at #
4069 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-268
4070-/*!100001 SET @@session.gtid_seq_no=268*//*!*/;
4071+/*M!100001 SET @@session.gtid_seq_no=268*//*!*/;
4072 START TRANSACTION
4073 /*!*/;
4074 # at #
4075@@ -4507,7 +4507,7 @@ COMMIT
4076 /*!*/;
4077 # at #
4078 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-269
4079-/*!100001 SET @@session.gtid_seq_no=269*//*!*/;
4080+/*M!100001 SET @@session.gtid_seq_no=269*//*!*/;
4081 START TRANSACTION
4082 /*!*/;
4083 # at #
4084@@ -4528,7 +4528,7 @@ COMMIT
4085 /*!*/;
4086 # at #
4087 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-270 ddl
4088-/*!100001 SET @@session.gtid_seq_no=270*//*!*/;
4089+/*M!100001 SET @@session.gtid_seq_no=270*//*!*/;
4090 # at #
4091 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4092 SET TIMESTAMP=1000000000/*!*/;
4093@@ -4536,7 +4536,7 @@ DROP TABLE `t1` /* generated by server */
4094 /*!*/;
4095 # at #
4096 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-271 ddl
4097-/*!100001 SET @@session.gtid_seq_no=271*//*!*/;
4098+/*M!100001 SET @@session.gtid_seq_no=271*//*!*/;
4099 # at #
4100 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4101 SET TIMESTAMP=1000000000/*!*/;
4102@@ -4544,7 +4544,7 @@ CREATE TABLE t1 (c72 MEDIUMTEXT)
4103 /*!*/;
4104 # at #
4105 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-272
4106-/*!100001 SET @@session.gtid_seq_no=272*//*!*/;
4107+/*M!100001 SET @@session.gtid_seq_no=272*//*!*/;
4108 START TRANSACTION
4109 /*!*/;
4110 # at #
4111@@ -4565,7 +4565,7 @@ COMMIT
4112 /*!*/;
4113 # at #
4114 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-273
4115-/*!100001 SET @@session.gtid_seq_no=273*//*!*/;
4116+/*M!100001 SET @@session.gtid_seq_no=273*//*!*/;
4117 START TRANSACTION
4118 /*!*/;
4119 # at #
4120@@ -4586,7 +4586,7 @@ COMMIT
4121 /*!*/;
4122 # at #
4123 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-274 ddl
4124-/*!100001 SET @@session.gtid_seq_no=274*//*!*/;
4125+/*M!100001 SET @@session.gtid_seq_no=274*//*!*/;
4126 # at #
4127 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4128 SET TIMESTAMP=1000000000/*!*/;
4129@@ -4594,7 +4594,7 @@ DROP TABLE `t1` /* generated by server */
4130 /*!*/;
4131 # at #
4132 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-275 ddl
4133-/*!100001 SET @@session.gtid_seq_no=275*//*!*/;
4134+/*M!100001 SET @@session.gtid_seq_no=275*//*!*/;
4135 # at #
4136 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4137 SET TIMESTAMP=1000000000/*!*/;
4138@@ -4602,7 +4602,7 @@ CREATE TABLE t1 (c75 LONGTEXT)
4139 /*!*/;
4140 # at #
4141 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-276
4142-/*!100001 SET @@session.gtid_seq_no=276*//*!*/;
4143+/*M!100001 SET @@session.gtid_seq_no=276*//*!*/;
4144 START TRANSACTION
4145 /*!*/;
4146 # at #
4147@@ -4623,7 +4623,7 @@ COMMIT
4148 /*!*/;
4149 # at #
4150 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-277
4151-/*!100001 SET @@session.gtid_seq_no=277*//*!*/;
4152+/*M!100001 SET @@session.gtid_seq_no=277*//*!*/;
4153 START TRANSACTION
4154 /*!*/;
4155 # at #
4156@@ -4644,7 +4644,7 @@ COMMIT
4157 /*!*/;
4158 # at #
4159 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-278 ddl
4160-/*!100001 SET @@session.gtid_seq_no=278*//*!*/;
4161+/*M!100001 SET @@session.gtid_seq_no=278*//*!*/;
4162 # at #
4163 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4164 SET TIMESTAMP=1000000000/*!*/;
4165@@ -4652,7 +4652,7 @@ DROP TABLE `t1` /* generated by server */
4166 /*!*/;
4167 # at #
4168 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-279 ddl
4169-/*!100001 SET @@session.gtid_seq_no=279*//*!*/;
4170+/*M!100001 SET @@session.gtid_seq_no=279*//*!*/;
4171 # at #
4172 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4173 SET TIMESTAMP=1000000000/*!*/;
4174@@ -4660,7 +4660,7 @@ CREATE TABLE t1 (c67 TINYTEXT CHARACTER SET UCS2)
4175 /*!*/;
4176 # at #
4177 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-280
4178-/*!100001 SET @@session.gtid_seq_no=280*//*!*/;
4179+/*M!100001 SET @@session.gtid_seq_no=280*//*!*/;
4180 START TRANSACTION
4181 /*!*/;
4182 # at #
4183@@ -4681,7 +4681,7 @@ COMMIT
4184 /*!*/;
4185 # at #
4186 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-281
4187-/*!100001 SET @@session.gtid_seq_no=281*//*!*/;
4188+/*M!100001 SET @@session.gtid_seq_no=281*//*!*/;
4189 START TRANSACTION
4190 /*!*/;
4191 # at #
4192@@ -4702,7 +4702,7 @@ COMMIT
4193 /*!*/;
4194 # at #
4195 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-282 ddl
4196-/*!100001 SET @@session.gtid_seq_no=282*//*!*/;
4197+/*M!100001 SET @@session.gtid_seq_no=282*//*!*/;
4198 # at #
4199 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4200 SET TIMESTAMP=1000000000/*!*/;
4201@@ -4710,7 +4710,7 @@ DROP TABLE `t1` /* generated by server */
4202 /*!*/;
4203 # at #
4204 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-283 ddl
4205-/*!100001 SET @@session.gtid_seq_no=283*//*!*/;
4206+/*M!100001 SET @@session.gtid_seq_no=283*//*!*/;
4207 # at #
4208 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4209 SET TIMESTAMP=1000000000/*!*/;
4210@@ -4718,7 +4718,7 @@ CREATE TABLE t1 (c70 TEXT CHARACTER SET UCS2)
4211 /*!*/;
4212 # at #
4213 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-284
4214-/*!100001 SET @@session.gtid_seq_no=284*//*!*/;
4215+/*M!100001 SET @@session.gtid_seq_no=284*//*!*/;
4216 START TRANSACTION
4217 /*!*/;
4218 # at #
4219@@ -4739,7 +4739,7 @@ COMMIT
4220 /*!*/;
4221 # at #
4222 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-285
4223-/*!100001 SET @@session.gtid_seq_no=285*//*!*/;
4224+/*M!100001 SET @@session.gtid_seq_no=285*//*!*/;
4225 START TRANSACTION
4226 /*!*/;
4227 # at #
4228@@ -4760,7 +4760,7 @@ COMMIT
4229 /*!*/;
4230 # at #
4231 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-286 ddl
4232-/*!100001 SET @@session.gtid_seq_no=286*//*!*/;
4233+/*M!100001 SET @@session.gtid_seq_no=286*//*!*/;
4234 # at #
4235 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4236 SET TIMESTAMP=1000000000/*!*/;
4237@@ -4768,7 +4768,7 @@ DROP TABLE `t1` /* generated by server */
4238 /*!*/;
4239 # at #
4240 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-287 ddl
4241-/*!100001 SET @@session.gtid_seq_no=287*//*!*/;
4242+/*M!100001 SET @@session.gtid_seq_no=287*//*!*/;
4243 # at #
4244 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4245 SET TIMESTAMP=1000000000/*!*/;
4246@@ -4776,7 +4776,7 @@ CREATE TABLE t1 (c73 MEDIUMTEXT CHARACTER SET UCS2)
4247 /*!*/;
4248 # at #
4249 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-288
4250-/*!100001 SET @@session.gtid_seq_no=288*//*!*/;
4251+/*M!100001 SET @@session.gtid_seq_no=288*//*!*/;
4252 START TRANSACTION
4253 /*!*/;
4254 # at #
4255@@ -4797,7 +4797,7 @@ COMMIT
4256 /*!*/;
4257 # at #
4258 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-289
4259-/*!100001 SET @@session.gtid_seq_no=289*//*!*/;
4260+/*M!100001 SET @@session.gtid_seq_no=289*//*!*/;
4261 START TRANSACTION
4262 /*!*/;
4263 # at #
4264@@ -4818,7 +4818,7 @@ COMMIT
4265 /*!*/;
4266 # at #
4267 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-290 ddl
4268-/*!100001 SET @@session.gtid_seq_no=290*//*!*/;
4269+/*M!100001 SET @@session.gtid_seq_no=290*//*!*/;
4270 # at #
4271 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4272 SET TIMESTAMP=1000000000/*!*/;
4273@@ -4826,7 +4826,7 @@ DROP TABLE `t1` /* generated by server */
4274 /*!*/;
4275 # at #
4276 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-291 ddl
4277-/*!100001 SET @@session.gtid_seq_no=291*//*!*/;
4278+/*M!100001 SET @@session.gtid_seq_no=291*//*!*/;
4279 # at #
4280 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4281 SET TIMESTAMP=1000000000/*!*/;
4282@@ -4834,7 +4834,7 @@ CREATE TABLE t1 (c76 LONGTEXT CHARACTER SET UCS2)
4283 /*!*/;
4284 # at #
4285 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-292
4286-/*!100001 SET @@session.gtid_seq_no=292*//*!*/;
4287+/*M!100001 SET @@session.gtid_seq_no=292*//*!*/;
4288 START TRANSACTION
4289 /*!*/;
4290 # at #
4291@@ -4855,7 +4855,7 @@ COMMIT
4292 /*!*/;
4293 # at #
4294 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-293
4295-/*!100001 SET @@session.gtid_seq_no=293*//*!*/;
4296+/*M!100001 SET @@session.gtid_seq_no=293*//*!*/;
4297 START TRANSACTION
4298 /*!*/;
4299 # at #
4300@@ -4876,7 +4876,7 @@ COMMIT
4301 /*!*/;
4302 # at #
4303 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-294 ddl
4304-/*!100001 SET @@session.gtid_seq_no=294*//*!*/;
4305+/*M!100001 SET @@session.gtid_seq_no=294*//*!*/;
4306 # at #
4307 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4308 SET TIMESTAMP=1000000000/*!*/;
4309@@ -4884,7 +4884,7 @@ DROP TABLE `t1` /* generated by server */
4310 /*!*/;
4311 # at #
4312 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-295 ddl
4313-/*!100001 SET @@session.gtid_seq_no=295*//*!*/;
4314+/*M!100001 SET @@session.gtid_seq_no=295*//*!*/;
4315 # at #
4316 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4317 SET TIMESTAMP=1000000000/*!*/;
4318@@ -4892,7 +4892,7 @@ CREATE TABLE t1 (c77 ENUM('a','b','c'))
4319 /*!*/;
4320 # at #
4321 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-296
4322-/*!100001 SET @@session.gtid_seq_no=296*//*!*/;
4323+/*M!100001 SET @@session.gtid_seq_no=296*//*!*/;
4324 START TRANSACTION
4325 /*!*/;
4326 # at #
4327@@ -4913,7 +4913,7 @@ COMMIT
4328 /*!*/;
4329 # at #
4330 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-297
4331-/*!100001 SET @@session.gtid_seq_no=297*//*!*/;
4332+/*M!100001 SET @@session.gtid_seq_no=297*//*!*/;
4333 START TRANSACTION
4334 /*!*/;
4335 # at #
4336@@ -4934,7 +4934,7 @@ COMMIT
4337 /*!*/;
4338 # at #
4339 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-298 ddl
4340-/*!100001 SET @@session.gtid_seq_no=298*//*!*/;
4341+/*M!100001 SET @@session.gtid_seq_no=298*//*!*/;
4342 # at #
4343 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4344 SET TIMESTAMP=1000000000/*!*/;
4345@@ -4942,7 +4942,7 @@ DROP TABLE `t1` /* generated by server */
4346 /*!*/;
4347 # at #
4348 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-299 ddl
4349-/*!100001 SET @@session.gtid_seq_no=299*//*!*/;
4350+/*M!100001 SET @@session.gtid_seq_no=299*//*!*/;
4351 # at #
4352 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4353 SET TIMESTAMP=1000000000/*!*/;
4354@@ -4950,7 +4950,7 @@ CREATE TABLE t1 (c78 SET('a','b','c','d','e','f'))
4355 /*!*/;
4356 # at #
4357 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-300
4358-/*!100001 SET @@session.gtid_seq_no=300*//*!*/;
4359+/*M!100001 SET @@session.gtid_seq_no=300*//*!*/;
4360 START TRANSACTION
4361 /*!*/;
4362 # at #
4363@@ -4971,7 +4971,7 @@ COMMIT
4364 /*!*/;
4365 # at #
4366 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-301
4367-/*!100001 SET @@session.gtid_seq_no=301*//*!*/;
4368+/*M!100001 SET @@session.gtid_seq_no=301*//*!*/;
4369 START TRANSACTION
4370 /*!*/;
4371 # at #
4372@@ -4992,7 +4992,7 @@ COMMIT
4373 /*!*/;
4374 # at #
4375 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-302
4376-/*!100001 SET @@session.gtid_seq_no=302*//*!*/;
4377+/*M!100001 SET @@session.gtid_seq_no=302*//*!*/;
4378 START TRANSACTION
4379 /*!*/;
4380 # at #
4381@@ -5013,7 +5013,7 @@ COMMIT
4382 /*!*/;
4383 # at #
4384 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-303
4385-/*!100001 SET @@session.gtid_seq_no=303*//*!*/;
4386+/*M!100001 SET @@session.gtid_seq_no=303*//*!*/;
4387 START TRANSACTION
4388 /*!*/;
4389 # at #
4390@@ -5034,7 +5034,7 @@ COMMIT
4391 /*!*/;
4392 # at #
4393 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-304
4394-/*!100001 SET @@session.gtid_seq_no=304*//*!*/;
4395+/*M!100001 SET @@session.gtid_seq_no=304*//*!*/;
4396 START TRANSACTION
4397 /*!*/;
4398 # at #
4399@@ -5055,7 +5055,7 @@ COMMIT
4400 /*!*/;
4401 # at #
4402 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-305
4403-/*!100001 SET @@session.gtid_seq_no=305*//*!*/;
4404+/*M!100001 SET @@session.gtid_seq_no=305*//*!*/;
4405 START TRANSACTION
4406 /*!*/;
4407 # at #
4408@@ -5076,7 +5076,7 @@ COMMIT
4409 /*!*/;
4410 # at #
4411 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-306
4412-/*!100001 SET @@session.gtid_seq_no=306*//*!*/;
4413+/*M!100001 SET @@session.gtid_seq_no=306*//*!*/;
4414 START TRANSACTION
4415 /*!*/;
4416 # at #
4417@@ -5097,7 +5097,7 @@ COMMIT
4418 /*!*/;
4419 # at #
4420 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-307
4421-/*!100001 SET @@session.gtid_seq_no=307*//*!*/;
4422+/*M!100001 SET @@session.gtid_seq_no=307*//*!*/;
4423 START TRANSACTION
4424 /*!*/;
4425 # at #
4426@@ -5118,7 +5118,7 @@ COMMIT
4427 /*!*/;
4428 # at #
4429 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-308 ddl
4430-/*!100001 SET @@session.gtid_seq_no=308*//*!*/;
4431+/*M!100001 SET @@session.gtid_seq_no=308*//*!*/;
4432 # at #
4433 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4434 SET TIMESTAMP=1000000000/*!*/;
4435@@ -5126,7 +5126,7 @@ DROP TABLE `t1` /* generated by server */
4436 /*!*/;
4437 # at #
4438 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-309 ddl
4439-/*!100001 SET @@session.gtid_seq_no=309*//*!*/;
4440+/*M!100001 SET @@session.gtid_seq_no=309*//*!*/;
4441 # at #
4442 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4443 SET TIMESTAMP=1000000000/*!*/;
4444@@ -5134,7 +5134,7 @@ CREATE TABLE t1 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0)
4445 /*!*/;
4446 # at #
4447 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-310 ddl
4448-/*!100001 SET @@session.gtid_seq_no=310*//*!*/;
4449+/*M!100001 SET @@session.gtid_seq_no=310*//*!*/;
4450 # at #
4451 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4452 SET TIMESTAMP=1000000000/*!*/;
4453@@ -5142,7 +5142,7 @@ CREATE TABLE t2 (a int NOT NULL DEFAULT 0, b int NOT NULL DEFAULT 0)
4454 /*!*/;
4455 # at #
4456 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-311
4457-/*!100001 SET @@session.gtid_seq_no=311*//*!*/;
4458+/*M!100001 SET @@session.gtid_seq_no=311*//*!*/;
4459 START TRANSACTION
4460 /*!*/;
4461 # at #
4462@@ -5164,7 +5164,7 @@ COMMIT
4463 /*!*/;
4464 # at #
4465 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-312
4466-/*!100001 SET @@session.gtid_seq_no=312*//*!*/;
4467+/*M!100001 SET @@session.gtid_seq_no=312*//*!*/;
4468 START TRANSACTION
4469 /*!*/;
4470 # at #
4471@@ -5186,7 +5186,7 @@ COMMIT
4472 /*!*/;
4473 # at #
4474 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-313
4475-/*!100001 SET @@session.gtid_seq_no=313*//*!*/;
4476+/*M!100001 SET @@session.gtid_seq_no=313*//*!*/;
4477 START TRANSACTION
4478 /*!*/;
4479 # at #
4480@@ -5208,7 +5208,7 @@ COMMIT
4481 /*!*/;
4482 # at #
4483 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-314
4484-/*!100001 SET @@session.gtid_seq_no=314*//*!*/;
4485+/*M!100001 SET @@session.gtid_seq_no=314*//*!*/;
4486 START TRANSACTION
4487 /*!*/;
4488 # at #
4489@@ -5230,7 +5230,7 @@ COMMIT
4490 /*!*/;
4491 # at #
4492 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-315
4493-/*!100001 SET @@session.gtid_seq_no=315*//*!*/;
4494+/*M!100001 SET @@session.gtid_seq_no=315*//*!*/;
4495 START TRANSACTION
4496 /*!*/;
4497 # at #
4498@@ -5280,7 +5280,7 @@ COMMIT
4499 /*!*/;
4500 # at #
4501 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-316 ddl
4502-/*!100001 SET @@session.gtid_seq_no=316*//*!*/;
4503+/*M!100001 SET @@session.gtid_seq_no=316*//*!*/;
4504 # at #
4505 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4506 SET TIMESTAMP=1000000000/*!*/;
4507@@ -5288,7 +5288,7 @@ DROP TABLE `t1`,`t2` /* generated by server */
4508 /*!*/;
4509 # at #
4510 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-317 ddl
4511-/*!100001 SET @@session.gtid_seq_no=317*//*!*/;
4512+/*M!100001 SET @@session.gtid_seq_no=317*//*!*/;
4513 # at #
4514 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4515 SET TIMESTAMP=1000000000/*!*/;
4516@@ -5298,7 +5298,7 @@ c_text_utf8 blob )
4517 /*!*/;
4518 # at #
4519 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-318
4520-/*!100001 SET @@session.gtid_seq_no=318*//*!*/;
4521+/*M!100001 SET @@session.gtid_seq_no=318*//*!*/;
4522 START TRANSACTION
4523 /*!*/;
4524 # at #
4525@@ -5321,7 +5321,7 @@ COMMIT
4526 /*!*/;
4527 # at #
4528 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-319 ddl
4529-/*!100001 SET @@session.gtid_seq_no=319*//*!*/;
4530+/*M!100001 SET @@session.gtid_seq_no=319*//*!*/;
4531 # at #
4532 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4533 SET TIMESTAMP=1000000000/*!*/;
4534@@ -5348,10 +5348,10 @@ DELIMITER /*!*/;
4535 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000002
4536 # at #
4537 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-320
4538-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4539-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4540-/*!100001 SET @@session.server_id=1*//*!*/;
4541-/*!100001 SET @@session.gtid_seq_no=320*//*!*/;
4542+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4543+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4544+/*M!100001 SET @@session.server_id=1*//*!*/;
4545+/*M!100001 SET @@session.gtid_seq_no=320*//*!*/;
4546 START TRANSACTION
4547 /*!*/;
4548 # at #
4549@@ -5377,10 +5377,10 @@ DELIMITER /*!*/;
4550 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003
4551 # at #
4552 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-324 ddl
4553-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4554-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4555-/*!100001 SET @@session.server_id=1*//*!*/;
4556-/*!100001 SET @@session.gtid_seq_no=324*//*!*/;
4557+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4558+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4559+/*M!100001 SET @@session.server_id=1*//*!*/;
4560+/*M!100001 SET @@session.gtid_seq_no=324*//*!*/;
4561 # at #
4562 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4563 use `test`/*!*/;
4564@@ -5397,7 +5397,7 @@ CREATE TABLE t1 (a GEOMETRY DEFAULT NULL)
4565 /*!*/;
4566 # at #
4567 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-325
4568-/*!100001 SET @@session.gtid_seq_no=325*//*!*/;
4569+/*M!100001 SET @@session.gtid_seq_no=325*//*!*/;
4570 START TRANSACTION
4571 /*!*/;
4572 # at #
4573@@ -5418,7 +5418,7 @@ COMMIT
4574 /*!*/;
4575 # at #
4576 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-326
4577-/*!100001 SET @@session.gtid_seq_no=326*//*!*/;
4578+/*M!100001 SET @@session.gtid_seq_no=326*//*!*/;
4579 START TRANSACTION
4580 /*!*/;
4581 # at #
4582@@ -5439,7 +5439,7 @@ COMMIT
4583 /*!*/;
4584 # at #
4585 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-327 ddl
4586-/*!100001 SET @@session.gtid_seq_no=327*//*!*/;
4587+/*M!100001 SET @@session.gtid_seq_no=327*//*!*/;
4588 # at #
4589 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4590 SET TIMESTAMP=1000000000/*!*/;
4591diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
4592index 96059d00..ae6577c4 100644
4593--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
4594+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
4595@@ -2261,10 +2261,10 @@ ROLLBACK/*!*/;
4596 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
4597 # at #
4598 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
4599-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4600-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4601-/*!100001 SET @@session.server_id=1*//*!*/;
4602-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
4603+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4604+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4605+/*M!100001 SET @@session.server_id=1*//*!*/;
4606+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
4607 # at #
4608 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4609 use `test`/*!*/;
4610@@ -2369,7 +2369,7 @@ crn INT -- row number
4611 /*!*/;
4612 # at #
4613 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans
4614-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
4615+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
4616 START TRANSACTION
4617 /*!*/;
4618 # at #
4619@@ -2551,7 +2551,7 @@ START TRANSACTION
4620 COMMIT/*!*/;
4621 # at #
4622 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans
4623-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
4624+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
4625 START TRANSACTION
4626 /*!*/;
4627 # at #
4628@@ -2733,7 +2733,7 @@ START TRANSACTION
4629 COMMIT/*!*/;
4630 # at #
4631 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans
4632-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
4633+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
4634 START TRANSACTION
4635 /*!*/;
4636 # at #
4637@@ -3081,7 +3081,7 @@ START TRANSACTION
4638 COMMIT/*!*/;
4639 # at #
4640 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 trans
4641-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
4642+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
4643 START TRANSACTION
4644 /*!*/;
4645 # at #
4646@@ -3421,7 +3421,7 @@ START TRANSACTION
4647 COMMIT/*!*/;
4648 # at #
4649 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 trans
4650-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
4651+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
4652 START TRANSACTION
4653 /*!*/;
4654 # at #
4655@@ -3766,7 +3766,7 @@ START TRANSACTION
4656 COMMIT/*!*/;
4657 # at #
4658 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 trans
4659-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
4660+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
4661 START TRANSACTION
4662 /*!*/;
4663 # at #
4664@@ -4109,7 +4109,7 @@ START TRANSACTION
4665 COMMIT/*!*/;
4666 # at #
4667 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 trans
4668-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
4669+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
4670 START TRANSACTION
4671 /*!*/;
4672 # at #
4673@@ -4455,7 +4455,7 @@ START TRANSACTION
4674 COMMIT/*!*/;
4675 # at #
4676 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9 trans
4677-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
4678+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
4679 START TRANSACTION
4680 /*!*/;
4681 # at #
4682@@ -4635,7 +4635,7 @@ START TRANSACTION
4683 COMMIT/*!*/;
4684 # at #
4685 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10 trans
4686-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
4687+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
4688 START TRANSACTION
4689 /*!*/;
4690 # at #
4691@@ -4812,7 +4812,7 @@ START TRANSACTION
4692 COMMIT/*!*/;
4693 # at #
4694 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11 trans
4695-/*!100001 SET @@session.gtid_seq_no=11*//*!*/;
4696+/*M!100001 SET @@session.gtid_seq_no=11*//*!*/;
4697 START TRANSACTION
4698 /*!*/;
4699 # at #
4700@@ -4992,7 +4992,7 @@ START TRANSACTION
4701 COMMIT/*!*/;
4702 # at #
4703 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12 trans
4704-/*!100001 SET @@session.gtid_seq_no=12*//*!*/;
4705+/*M!100001 SET @@session.gtid_seq_no=12*//*!*/;
4706 START TRANSACTION
4707 /*!*/;
4708 # at #
4709@@ -5270,10 +5270,10 @@ ROLLBACK/*!*/;
4710 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
4711 # at #
4712 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
4713-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4714-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4715-/*!100001 SET @@session.server_id=1*//*!*/;
4716-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
4717+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4718+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4719+/*M!100001 SET @@session.server_id=1*//*!*/;
4720+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
4721 # at #
4722 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4723 use `test`/*!*/;
4724@@ -5294,7 +5294,7 @@ crn INT -- row number
4725 /*!*/;
4726 # at #
4727 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans
4728-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
4729+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
4730 START TRANSACTION
4731 /*!*/;
4732 # at #
4733@@ -5364,7 +5364,7 @@ START TRANSACTION
4734 COMMIT/*!*/;
4735 # at #
4736 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans
4737-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
4738+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
4739 START TRANSACTION
4740 /*!*/;
4741 # at #
4742@@ -5443,7 +5443,7 @@ START TRANSACTION
4743 COMMIT/*!*/;
4744 # at #
4745 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans
4746-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
4747+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
4748 START TRANSACTION
4749 /*!*/;
4750 # at #
4751@@ -5670,10 +5670,10 @@ ROLLBACK/*!*/;
4752 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
4753 # at #
4754 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
4755-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4756-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4757-/*!100001 SET @@session.server_id=1*//*!*/;
4758-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
4759+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4760+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4761+/*M!100001 SET @@session.server_id=1*//*!*/;
4762+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
4763 # at #
4764 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4765 use `test`/*!*/;
4766@@ -5694,7 +5694,7 @@ c_1_n INT -- row number
4767 /*!*/;
4768 # at #
4769 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 ddl
4770-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
4771+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
4772 # at #
4773 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4774 SET TIMESTAMP=1000000000/*!*/;
4775@@ -5706,7 +5706,7 @@ c_2_n INT -- row number
4776 /*!*/;
4777 # at #
4778 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 ddl
4779-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
4780+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
4781 # at #
4782 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4783 SET TIMESTAMP=1000000000/*!*/;
4784@@ -5718,7 +5718,7 @@ c_3_n INT -- row number
4785 /*!*/;
4786 # at #
4787 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans
4788-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
4789+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
4790 START TRANSACTION
4791 /*!*/;
4792 # at #
4793@@ -5788,7 +5788,7 @@ START TRANSACTION
4794 COMMIT/*!*/;
4795 # at #
4796 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 trans
4797-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
4798+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
4799 START TRANSACTION
4800 /*!*/;
4801 # at #
4802@@ -5858,7 +5858,7 @@ START TRANSACTION
4803 COMMIT/*!*/;
4804 # at #
4805 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 trans
4806-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
4807+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
4808 START TRANSACTION
4809 /*!*/;
4810 # at #
4811@@ -5928,7 +5928,7 @@ START TRANSACTION
4812 COMMIT/*!*/;
4813 # at #
4814 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7 trans
4815-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
4816+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
4817 START TRANSACTION
4818 /*!*/;
4819 # at #
4820@@ -6118,7 +6118,7 @@ START TRANSACTION
4821 COMMIT/*!*/;
4822 # at #
4823 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8 trans
4824-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
4825+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
4826 START TRANSACTION
4827 /*!*/;
4828 # at #
4829@@ -6308,10 +6308,10 @@ ROLLBACK/*!*/;
4830 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
4831 # at #
4832 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
4833-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4834-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4835-/*!100001 SET @@session.server_id=1*//*!*/;
4836-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
4837+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4838+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4839+/*M!100001 SET @@session.server_id=1*//*!*/;
4840+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
4841 # at #
4842 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4843 use `test`/*!*/;
4844@@ -6332,7 +6332,7 @@ c3 VARCHAR(60)
4845 /*!*/;
4846 # at #
4847 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans
4848-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
4849+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
4850 START TRANSACTION
4851 /*!*/;
4852 # at #
4853diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
4854index 630a9f1d..76c60182 100644
4855--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
4856+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
4857@@ -2259,10 +2259,10 @@ ROLLBACK/*!*/;
4858 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
4859 # at #
4860 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
4861-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4862-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4863-/*!100001 SET @@session.server_id=1*//*!*/;
4864-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
4865+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4866+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4867+/*M!100001 SET @@session.server_id=1*//*!*/;
4868+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
4869 # at #
4870 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4871 use `test`/*!*/;
4872@@ -2367,7 +2367,7 @@ crn INT -- row number
4873 /*!*/;
4874 # at #
4875 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2
4876-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
4877+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
4878 START TRANSACTION
4879 /*!*/;
4880 # at #
4881@@ -2552,7 +2552,7 @@ COMMIT
4882 /*!*/;
4883 # at #
4884 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3
4885-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
4886+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
4887 START TRANSACTION
4888 /*!*/;
4889 # at #
4890@@ -2736,7 +2736,7 @@ COMMIT
4891 /*!*/;
4892 # at #
4893 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4
4894-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
4895+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
4896 START TRANSACTION
4897 /*!*/;
4898 # at #
4899@@ -3086,7 +3086,7 @@ COMMIT
4900 /*!*/;
4901 # at #
4902 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5
4903-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
4904+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
4905 START TRANSACTION
4906 /*!*/;
4907 # at #
4908@@ -3428,7 +3428,7 @@ COMMIT
4909 /*!*/;
4910 # at #
4911 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6
4912-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
4913+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
4914 START TRANSACTION
4915 /*!*/;
4916 # at #
4917@@ -3775,7 +3775,7 @@ COMMIT
4918 /*!*/;
4919 # at #
4920 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7
4921-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
4922+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
4923 START TRANSACTION
4924 /*!*/;
4925 # at #
4926@@ -4120,7 +4120,7 @@ COMMIT
4927 /*!*/;
4928 # at #
4929 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8
4930-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
4931+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
4932 START TRANSACTION
4933 /*!*/;
4934 # at #
4935@@ -4468,7 +4468,7 @@ COMMIT
4936 /*!*/;
4937 # at #
4938 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9
4939-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
4940+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
4941 START TRANSACTION
4942 /*!*/;
4943 # at #
4944@@ -4650,7 +4650,7 @@ COMMIT
4945 /*!*/;
4946 # at #
4947 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10
4948-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
4949+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
4950 START TRANSACTION
4951 /*!*/;
4952 # at #
4953@@ -4829,7 +4829,7 @@ COMMIT
4954 /*!*/;
4955 # at #
4956 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11
4957-/*!100001 SET @@session.gtid_seq_no=11*//*!*/;
4958+/*M!100001 SET @@session.gtid_seq_no=11*//*!*/;
4959 START TRANSACTION
4960 /*!*/;
4961 # at #
4962@@ -5011,7 +5011,7 @@ COMMIT
4963 /*!*/;
4964 # at #
4965 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12
4966-/*!100001 SET @@session.gtid_seq_no=12*//*!*/;
4967+/*M!100001 SET @@session.gtid_seq_no=12*//*!*/;
4968 START TRANSACTION
4969 /*!*/;
4970 # at #
4971@@ -5291,10 +5291,10 @@ ROLLBACK/*!*/;
4972 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
4973 # at #
4974 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
4975-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4976-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
4977-/*!100001 SET @@session.server_id=1*//*!*/;
4978-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
4979+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
4980+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
4981+/*M!100001 SET @@session.server_id=1*//*!*/;
4982+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
4983 # at #
4984 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
4985 use `test`/*!*/;
4986@@ -5315,7 +5315,7 @@ crn INT -- row number
4987 /*!*/;
4988 # at #
4989 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2
4990-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
4991+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
4992 START TRANSACTION
4993 /*!*/;
4994 # at #
4995@@ -5387,7 +5387,7 @@ COMMIT
4996 /*!*/;
4997 # at #
4998 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3
4999-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5000+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5001 START TRANSACTION
5002 /*!*/;
5003 # at #
5004@@ -5468,7 +5468,7 @@ COMMIT
5005 /*!*/;
5006 # at #
5007 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4
5008-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5009+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5010 START TRANSACTION
5011 /*!*/;
5012 # at #
5013@@ -5697,10 +5697,10 @@ ROLLBACK/*!*/;
5014 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
5015 # at #
5016 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
5017-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5018-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5019-/*!100001 SET @@session.server_id=1*//*!*/;
5020-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5021+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5022+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5023+/*M!100001 SET @@session.server_id=1*//*!*/;
5024+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5025 # at #
5026 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5027 use `test`/*!*/;
5028@@ -5721,7 +5721,7 @@ c_1_n INT -- row number
5029 /*!*/;
5030 # at #
5031 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 ddl
5032-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5033+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5034 # at #
5035 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5036 SET TIMESTAMP=1000000000/*!*/;
5037@@ -5733,7 +5733,7 @@ c_2_n INT -- row number
5038 /*!*/;
5039 # at #
5040 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 ddl
5041-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5042+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5043 # at #
5044 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5045 SET TIMESTAMP=1000000000/*!*/;
5046@@ -5745,7 +5745,7 @@ c_3_n INT -- row number
5047 /*!*/;
5048 # at #
5049 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4
5050-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5051+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5052 START TRANSACTION
5053 /*!*/;
5054 # at #
5055@@ -5817,7 +5817,7 @@ COMMIT
5056 /*!*/;
5057 # at #
5058 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5
5059-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5060+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5061 START TRANSACTION
5062 /*!*/;
5063 # at #
5064@@ -5889,7 +5889,7 @@ COMMIT
5065 /*!*/;
5066 # at #
5067 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6
5068-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5069+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5070 START TRANSACTION
5071 /*!*/;
5072 # at #
5073@@ -5961,7 +5961,7 @@ COMMIT
5074 /*!*/;
5075 # at #
5076 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7
5077-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5078+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5079 START TRANSACTION
5080 /*!*/;
5081 # at #
5082@@ -6153,7 +6153,7 @@ COMMIT
5083 /*!*/;
5084 # at #
5085 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8
5086-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5087+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5088 START TRANSACTION
5089 /*!*/;
5090 # at #
5091@@ -6345,10 +6345,10 @@ ROLLBACK/*!*/;
5092 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
5093 # at #
5094 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
5095-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5096-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5097-/*!100001 SET @@session.server_id=1*//*!*/;
5098-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5099+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5100+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5101+/*M!100001 SET @@session.server_id=1*//*!*/;
5102+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5103 # at #
5104 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5105 use `test`/*!*/;
5106@@ -6369,7 +6369,7 @@ c3 VARCHAR(60)
5107 /*!*/;
5108 # at #
5109 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2
5110-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5111+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5112 START TRANSACTION
5113 /*!*/;
5114 # at #
5115diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
5116index 748b92df..9e47124b 100644
5117--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
5118+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
5119@@ -137,10 +137,10 @@ ROLLBACK/*!*/;
5120 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
5121 # at #
5122 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
5123-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5124-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5125-/*!100001 SET @@session.server_id=1*//*!*/;
5126-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5127+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5128+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5129+/*M!100001 SET @@session.server_id=1*//*!*/;
5130+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5131 # at #
5132 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5133 use `test`/*!*/;
5134@@ -160,7 +160,7 @@ c2 VARCHAR(20)
5135 /*!*/;
5136 # at #
5137 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 ddl
5138-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5139+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5140 # at #
5141 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5142 SET TIMESTAMP=1000000000/*!*/;
5143@@ -171,7 +171,7 @@ c2 VARCHAR(20)
5144 /*!*/;
5145 # at #
5146 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans
5147-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5148+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5149 START TRANSACTION
5150 /*!*/;
5151 # at #
5152@@ -240,7 +240,7 @@ START TRANSACTION
5153 COMMIT/*!*/;
5154 # at #
5155 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 ddl
5156-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5157+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5158 # at #
5159 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5160 SET TIMESTAMP=1000000000/*!*/;
5161@@ -248,7 +248,7 @@ TRUNCATE TABLE t1
5162 /*!*/;
5163 # at #
5164 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 ddl
5165-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5166+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5167 # at #
5168 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5169 SET TIMESTAMP=1000000000/*!*/;
5170@@ -256,7 +256,7 @@ TRUNCATE TABLE t1
5171 /*!*/;
5172 # at #
5173 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6
5174-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5175+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5176 START TRANSACTION
5177 /*!*/;
5178 # at #
5179@@ -286,7 +286,7 @@ COMMIT
5180 /*!*/;
5181 # at #
5182 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-7
5183-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5184+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5185 START TRANSACTION
5186 /*!*/;
5187 # at #
5188@@ -325,7 +325,7 @@ COMMIT
5189 /*!*/;
5190 # at #
5191 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-8
5192-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5193+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5194 START TRANSACTION
5195 /*!*/;
5196 # at #
5197@@ -347,7 +347,7 @@ COMMIT
5198 /*!*/;
5199 # at #
5200 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-9 trans
5201-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5202+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5203 START TRANSACTION
5204 /*!*/;
5205 # at #
5206@@ -416,7 +416,7 @@ START TRANSACTION
5207 COMMIT/*!*/;
5208 # at #
5209 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-10 ddl
5210-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
5211+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
5212 # at #
5213 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5214 SET TIMESTAMP=1000000000/*!*/;
5215@@ -424,7 +424,7 @@ TRUNCATE TABLE t1
5216 /*!*/;
5217 # at #
5218 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-11 ddl
5219-/*!100001 SET @@session.gtid_seq_no=11*//*!*/;
5220+/*M!100001 SET @@session.gtid_seq_no=11*//*!*/;
5221 # at #
5222 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5223 SET TIMESTAMP=1000000000/*!*/;
5224@@ -432,7 +432,7 @@ TRUNCATE TABLE t2
5225 /*!*/;
5226 # at #
5227 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-12
5228-/*!100001 SET @@session.gtid_seq_no=12*//*!*/;
5229+/*M!100001 SET @@session.gtid_seq_no=12*//*!*/;
5230 START TRANSACTION
5231 /*!*/;
5232 # at #
5233@@ -462,7 +462,7 @@ COMMIT
5234 /*!*/;
5235 # at #
5236 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-13
5237-/*!100001 SET @@session.gtid_seq_no=13*//*!*/;
5238+/*M!100001 SET @@session.gtid_seq_no=13*//*!*/;
5239 START TRANSACTION
5240 /*!*/;
5241 # at #
5242@@ -501,7 +501,7 @@ COMMIT
5243 /*!*/;
5244 # at #
5245 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-14
5246-/*!100001 SET @@session.gtid_seq_no=14*//*!*/;
5247+/*M!100001 SET @@session.gtid_seq_no=14*//*!*/;
5248 START TRANSACTION
5249 /*!*/;
5250 # at #
5251@@ -523,7 +523,7 @@ COMMIT
5252 /*!*/;
5253 # at #
5254 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-15 ddl
5255-/*!100001 SET @@session.gtid_seq_no=15*//*!*/;
5256+/*M!100001 SET @@session.gtid_seq_no=15*//*!*/;
5257 # at #
5258 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5259 SET TIMESTAMP=1000000000/*!*/;
5260@@ -531,7 +531,7 @@ TRUNCATE TABLE t1
5261 /*!*/;
5262 # at #
5263 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-16 ddl
5264-/*!100001 SET @@session.gtid_seq_no=16*//*!*/;
5265+/*M!100001 SET @@session.gtid_seq_no=16*//*!*/;
5266 # at #
5267 #010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5268 SET TIMESTAMP=1000000000/*!*/;
5269diff --git a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result
5270index ffdb31cd..65db6e9d 100644
5271--- a/mysql-test/suite/binlog/r/binlog_row_annotate.result
5272+++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result
5273@@ -108,10 +108,10 @@ ROLLBACK/*!*/;
5274 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
5275 # at #
5276 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
5277-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5278-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5279-/*!100001 SET @@session.server_id=1*//*!*/;
5280-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5281+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5282+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5283+/*M!100001 SET @@session.server_id=1*//*!*/;
5284+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5285 # at #
5286 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5287 SET TIMESTAMP=1000000000/*!*/;
5288@@ -127,7 +127,7 @@ CREATE DATABASE test1
5289 /*!*/;
5290 # at #
5291 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
5292-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5293+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5294 # at #
5295 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5296 SET TIMESTAMP=1000000000/*!*/;
5297@@ -135,7 +135,7 @@ CREATE DATABASE test2
5298 /*!*/;
5299 # at #
5300 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
5301-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5302+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5303 # at #
5304 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5305 SET TIMESTAMP=1000000000/*!*/;
5306@@ -143,7 +143,7 @@ CREATE DATABASE test3
5307 /*!*/;
5308 # at #
5309 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
5310-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5311+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5312 START TRANSACTION
5313 /*!*/;
5314 # at #
5315@@ -170,7 +170,7 @@ COMMIT
5316 /*!*/;
5317 # at #
5318 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
5319-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5320+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5321 START TRANSACTION
5322 /*!*/;
5323 # at #
5324@@ -197,7 +197,7 @@ COMMIT
5325 /*!*/;
5326 # at #
5327 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
5328-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5329+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5330 START TRANSACTION
5331 /*!*/;
5332 # at #
5333@@ -224,7 +224,7 @@ COMMIT
5334 /*!*/;
5335 # at #
5336 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
5337-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5338+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5339 START TRANSACTION
5340 /*!*/;
5341 # at #
5342@@ -266,7 +266,7 @@ COMMIT
5343 /*!*/;
5344 # at #
5345 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
5346-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5347+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5348 START TRANSACTION
5349 /*!*/;
5350 # at #
5351@@ -293,7 +293,7 @@ COMMIT
5352 /*!*/;
5353 # at #
5354 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
5355-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5356+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5357 START TRANSACTION
5358 /*!*/;
5359 # at #
5360@@ -346,10 +346,10 @@ ROLLBACK/*!*/;
5361 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
5362 # at #
5363 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
5364-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5365-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5366-/*!100001 SET @@session.server_id=1*//*!*/;
5367-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5368+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5369+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5370+/*M!100001 SET @@session.server_id=1*//*!*/;
5371+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5372 # at #
5373 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5374 SET TIMESTAMP=1000000000/*!*/;
5375@@ -365,15 +365,15 @@ CREATE DATABASE test1
5376 /*!*/;
5377 # at #
5378 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
5379-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5380+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5381 # at #
5382 # at #
5383 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
5384-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5385+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5386 # at #
5387 # at #
5388 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
5389-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5390+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5391 START TRANSACTION
5392 /*!*/;
5393 # at #
5394@@ -400,7 +400,7 @@ COMMIT
5395 /*!*/;
5396 # at #
5397 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
5398-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5399+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5400 START TRANSACTION
5401 /*!*/;
5402 # at #
5403@@ -413,7 +413,7 @@ COMMIT
5404 /*!*/;
5405 # at #
5406 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
5407-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5408+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5409 START TRANSACTION
5410 /*!*/;
5411 # at #
5412@@ -426,7 +426,7 @@ COMMIT
5413 /*!*/;
5414 # at #
5415 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
5416-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5417+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5418 START TRANSACTION
5419 /*!*/;
5420 # at #
5421@@ -456,7 +456,7 @@ COMMIT
5422 /*!*/;
5423 # at #
5424 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
5425-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5426+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5427 START TRANSACTION
5428 /*!*/;
5429 # at #
5430@@ -469,7 +469,7 @@ COMMIT
5431 /*!*/;
5432 # at #
5433 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
5434-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5435+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5436 START TRANSACTION
5437 /*!*/;
5438 # at #
5439@@ -505,10 +505,10 @@ ROLLBACK/*!*/;
5440 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
5441 # at #
5442 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
5443-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5444-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5445-/*!100001 SET @@session.server_id=1*//*!*/;
5446-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5447+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5448+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5449+/*M!100001 SET @@session.server_id=1*//*!*/;
5450+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5451 # at #
5452 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5453 SET TIMESTAMP=1000000000/*!*/;
5454@@ -524,7 +524,7 @@ CREATE DATABASE test1
5455 /*!*/;
5456 # at #
5457 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
5458-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5459+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5460 # at #
5461 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5462 SET TIMESTAMP=1000000000/*!*/;
5463@@ -532,7 +532,7 @@ CREATE DATABASE test2
5464 /*!*/;
5465 # at #
5466 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
5467-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5468+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5469 # at #
5470 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5471 SET TIMESTAMP=1000000000/*!*/;
5472@@ -540,7 +540,7 @@ CREATE DATABASE test3
5473 /*!*/;
5474 # at #
5475 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
5476-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5477+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5478 START TRANSACTION
5479 /*!*/;
5480 # at #
5481@@ -565,7 +565,7 @@ COMMIT
5482 /*!*/;
5483 # at #
5484 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
5485-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5486+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5487 START TRANSACTION
5488 /*!*/;
5489 # at #
5490@@ -590,7 +590,7 @@ COMMIT
5491 /*!*/;
5492 # at #
5493 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
5494-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5495+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5496 START TRANSACTION
5497 /*!*/;
5498 # at #
5499@@ -615,7 +615,7 @@ COMMIT
5500 /*!*/;
5501 # at #
5502 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
5503-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5504+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5505 START TRANSACTION
5506 /*!*/;
5507 # at #
5508@@ -653,7 +653,7 @@ COMMIT
5509 /*!*/;
5510 # at #
5511 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
5512-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5513+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5514 START TRANSACTION
5515 /*!*/;
5516 # at #
5517@@ -678,7 +678,7 @@ COMMIT
5518 /*!*/;
5519 # at #
5520 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
5521-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5522+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5523 START TRANSACTION
5524 /*!*/;
5525 # at #
5526@@ -731,10 +731,10 @@ ROLLBACK/*!*/;
5527 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
5528 # at #
5529 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
5530-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5531-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5532-/*!100001 SET @@session.server_id=1*//*!*/;
5533-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5534+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5535+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5536+/*M!100001 SET @@session.server_id=1*//*!*/;
5537+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5538 # at #
5539 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5540 SET TIMESTAMP=1000000000/*!*/;
5541@@ -750,7 +750,7 @@ CREATE DATABASE test1
5542 /*!*/;
5543 # at #
5544 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
5545-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5546+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5547 # at #
5548 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5549 SET TIMESTAMP=1000000000/*!*/;
5550@@ -758,7 +758,7 @@ CREATE DATABASE test2
5551 /*!*/;
5552 # at #
5553 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
5554-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5555+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5556 # at #
5557 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5558 SET TIMESTAMP=1000000000/*!*/;
5559@@ -766,7 +766,7 @@ CREATE DATABASE test3
5560 /*!*/;
5561 # at #
5562 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
5563-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5564+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5565 START TRANSACTION
5566 /*!*/;
5567 # at #
5568@@ -793,7 +793,7 @@ COMMIT
5569 /*!*/;
5570 # at #
5571 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
5572-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5573+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5574 START TRANSACTION
5575 /*!*/;
5576 # at #
5577@@ -820,7 +820,7 @@ COMMIT
5578 /*!*/;
5579 # at #
5580 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
5581-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5582+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5583 START TRANSACTION
5584 /*!*/;
5585 # at #
5586@@ -847,7 +847,7 @@ COMMIT
5587 /*!*/;
5588 # at #
5589 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
5590-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5591+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5592 START TRANSACTION
5593 /*!*/;
5594 # at #
5595@@ -889,7 +889,7 @@ COMMIT
5596 /*!*/;
5597 # at #
5598 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
5599-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5600+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5601 START TRANSACTION
5602 /*!*/;
5603 # at #
5604@@ -916,7 +916,7 @@ COMMIT
5605 /*!*/;
5606 # at #
5607 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
5608-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5609+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5610 START TRANSACTION
5611 /*!*/;
5612 # at #
5613@@ -969,10 +969,10 @@ ROLLBACK/*!*/;
5614 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
5615 # at #
5616 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
5617-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5618-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5619-/*!100001 SET @@session.server_id=1*//*!*/;
5620-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5621+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5622+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5623+/*M!100001 SET @@session.server_id=1*//*!*/;
5624+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5625 # at #
5626 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5627 SET TIMESTAMP=1000000000/*!*/;
5628@@ -988,15 +988,15 @@ CREATE DATABASE test1
5629 /*!*/;
5630 # at #
5631 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
5632-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5633+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5634 # at #
5635 # at #
5636 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
5637-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5638+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5639 # at #
5640 # at #
5641 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
5642-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5643+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5644 START TRANSACTION
5645 /*!*/;
5646 # at #
5647@@ -1023,7 +1023,7 @@ COMMIT
5648 /*!*/;
5649 # at #
5650 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
5651-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5652+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5653 START TRANSACTION
5654 /*!*/;
5655 # at #
5656@@ -1036,7 +1036,7 @@ COMMIT
5657 /*!*/;
5658 # at #
5659 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
5660-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5661+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5662 START TRANSACTION
5663 /*!*/;
5664 # at #
5665@@ -1049,7 +1049,7 @@ COMMIT
5666 /*!*/;
5667 # at #
5668 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
5669-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5670+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5671 START TRANSACTION
5672 /*!*/;
5673 # at #
5674@@ -1079,7 +1079,7 @@ COMMIT
5675 /*!*/;
5676 # at #
5677 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
5678-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5679+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5680 START TRANSACTION
5681 /*!*/;
5682 # at #
5683@@ -1092,7 +1092,7 @@ COMMIT
5684 /*!*/;
5685 # at #
5686 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
5687-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5688+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5689 START TRANSACTION
5690 /*!*/;
5691 # at #
5692@@ -1128,10 +1128,10 @@ ROLLBACK/*!*/;
5693 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
5694 # at #
5695 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
5696-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5697-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5698-/*!100001 SET @@session.server_id=1*//*!*/;
5699-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5700+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5701+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5702+/*M!100001 SET @@session.server_id=1*//*!*/;
5703+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5704 # at #
5705 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5706 SET TIMESTAMP=1000000000/*!*/;
5707@@ -1147,7 +1147,7 @@ CREATE DATABASE test1
5708 /*!*/;
5709 # at #
5710 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
5711-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5712+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5713 # at #
5714 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5715 SET TIMESTAMP=1000000000/*!*/;
5716@@ -1155,7 +1155,7 @@ CREATE DATABASE test2
5717 /*!*/;
5718 # at #
5719 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
5720-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5721+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5722 # at #
5723 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
5724 SET TIMESTAMP=1000000000/*!*/;
5725@@ -1163,7 +1163,7 @@ CREATE DATABASE test3
5726 /*!*/;
5727 # at #
5728 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
5729-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5730+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5731 START TRANSACTION
5732 /*!*/;
5733 # at #
5734@@ -1187,7 +1187,7 @@ COMMIT
5735 /*!*/;
5736 # at #
5737 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
5738-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5739+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5740 START TRANSACTION
5741 /*!*/;
5742 # at #
5743@@ -1211,7 +1211,7 @@ COMMIT
5744 /*!*/;
5745 # at #
5746 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
5747-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5748+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5749 START TRANSACTION
5750 /*!*/;
5751 # at #
5752@@ -1235,7 +1235,7 @@ COMMIT
5753 /*!*/;
5754 # at #
5755 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
5756-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5757+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5758 START TRANSACTION
5759 /*!*/;
5760 # at #
5761@@ -1272,7 +1272,7 @@ COMMIT
5762 /*!*/;
5763 # at #
5764 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
5765-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5766+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5767 START TRANSACTION
5768 /*!*/;
5769 # at #
5770@@ -1296,7 +1296,7 @@ COMMIT
5771 /*!*/;
5772 # at #
5773 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
5774-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5775+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5776 START TRANSACTION
5777 /*!*/;
5778 # at #
5779diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
5780index 74aef814..856972e3 100644
5781--- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
5782+++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
5783@@ -83,10 +83,10 @@ DELIMITER /*!*/;
5784 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003
5785 # at #
5786 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl
5787-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5788-/*!100001 SET @@session.gtid_domain_id=#*//*!*/;
5789-/*!100001 SET @@session.server_id=#*//*!*/;
5790-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5791+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5792+/*M!100001 SET @@session.gtid_domain_id=#*//*!*/;
5793+/*M!100001 SET @@session.server_id=#*//*!*/;
5794+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5795 # at #
5796 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5797 use `test`/*!*/;
5798@@ -103,7 +103,7 @@ CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8)
5799 /*!*/;
5800 # at #
5801 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
5802-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5803+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5804 START TRANSACTION
5805 /*!*/;
5806 # at #
5807@@ -124,7 +124,7 @@ COMMIT
5808 /*!*/;
5809 # at #
5810 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
5811-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5812+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5813 START TRANSACTION
5814 /*!*/;
5815 # at #
5816@@ -145,7 +145,7 @@ COMMIT
5817 /*!*/;
5818 # at #
5819 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
5820-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5821+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5822 START TRANSACTION
5823 /*!*/;
5824 # at #
5825@@ -166,7 +166,7 @@ COMMIT
5826 /*!*/;
5827 # at #
5828 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
5829-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5830+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5831 START TRANSACTION
5832 /*!*/;
5833 # at #
5834@@ -187,7 +187,7 @@ COMMIT
5835 /*!*/;
5836 # at #
5837 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
5838-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5839+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5840 START TRANSACTION
5841 /*!*/;
5842 # at #
5843@@ -208,7 +208,7 @@ COMMIT
5844 /*!*/;
5845 # at #
5846 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
5847-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5848+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5849 START TRANSACTION
5850 /*!*/;
5851 # at #
5852@@ -229,7 +229,7 @@ COMMIT
5853 /*!*/;
5854 # at #
5855 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl
5856-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
5857+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
5858 # at #
5859 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5860 SET TIMESTAMP=XXX/*!*/;
5861diff --git a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
5862index dc7750b9..aa539369 100644
5863--- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
5864+++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
5865@@ -41,10 +41,10 @@ ROLLBACK/*!*/;
5866 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
5867 # at #
5868 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-1 ddl
5869-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5870-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5871-/*!100001 SET @@session.server_id=1*//*!*/;
5872-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5873+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5874+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5875+/*M!100001 SET @@session.server_id=1*//*!*/;
5876+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5877 # at #
5878 use `new_test1`/*!*/;
5879 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5880@@ -61,7 +61,7 @@ CREATE TABLE t1 (a INT, b INT)
5881 /*!*/;
5882 # at #
5883 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-2
5884-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5885+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5886 START TRANSACTION
5887 /*!*/;
5888 # at #
5889@@ -87,7 +87,7 @@ COMMIT
5890 /*!*/;
5891 # at #
5892 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-3 ddl
5893-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5894+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5895 # at #
5896 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5897 use `test2`/*!*/;
5898@@ -96,7 +96,7 @@ CREATE TABLE t2 (a INT)
5899 /*!*/;
5900 # at #
5901 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-4
5902-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5903+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
5904 START TRANSACTION
5905 /*!*/;
5906 # at #
5907@@ -120,7 +120,7 @@ COMMIT
5908 /*!*/;
5909 # at #
5910 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-5
5911-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
5912+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
5913 START TRANSACTION
5914 /*!*/;
5915 # at #
5916@@ -142,7 +142,7 @@ COMMIT
5917 /*!*/;
5918 # at #
5919 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-6 ddl
5920-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
5921+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
5922 # at #
5923 use `new_test3`/*!*/;
5924 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5925@@ -151,7 +151,7 @@ CREATE TABLE t3 (a INT)
5926 /*!*/;
5927 # at #
5928 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-7
5929-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
5930+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
5931 START TRANSACTION
5932 /*!*/;
5933 # at #
5934@@ -175,7 +175,7 @@ COMMIT
5935 /*!*/;
5936 # at #
5937 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-8
5938-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
5939+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
5940 START TRANSACTION
5941 /*!*/;
5942 # at #
5943@@ -197,7 +197,7 @@ COMMIT
5944 /*!*/;
5945 # at #
5946 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-9
5947-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
5948+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
5949 START TRANSACTION
5950 /*!*/;
5951 # at #
5952@@ -236,7 +236,7 @@ COMMIT
5953 /*!*/;
5954 # at #
5955 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-10
5956-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
5957+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
5958 START TRANSACTION
5959 /*!*/;
5960 # at #
5961@@ -282,10 +282,10 @@ ROLLBACK/*!*/;
5962 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
5963 # at #
5964 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-1 ddl
5965-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5966-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
5967-/*!100001 SET @@session.server_id=1*//*!*/;
5968-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
5969+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
5970+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
5971+/*M!100001 SET @@session.server_id=1*//*!*/;
5972+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
5973 # at #
5974 use `new_test1`/*!*/;
5975 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5976@@ -302,7 +302,7 @@ CREATE TABLE t1 (a INT, b INT)
5977 /*!*/;
5978 # at #
5979 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-2
5980-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
5981+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
5982 START TRANSACTION
5983 /*!*/;
5984 # at #
5985@@ -328,7 +328,7 @@ COMMIT
5986 /*!*/;
5987 # at #
5988 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-3 ddl
5989-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
5990+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
5991 # at #
5992 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
5993 use `test2`/*!*/;
5994@@ -337,7 +337,7 @@ CREATE TABLE t2 (a INT)
5995 /*!*/;
5996 # at #
5997 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-4
5998-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
5999+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
6000 START TRANSACTION
6001 /*!*/;
6002 # at #
6003@@ -361,7 +361,7 @@ COMMIT
6004 /*!*/;
6005 # at #
6006 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-5
6007-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
6008+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
6009 START TRANSACTION
6010 /*!*/;
6011 # at #
6012@@ -383,7 +383,7 @@ COMMIT
6013 /*!*/;
6014 # at #
6015 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-6 ddl
6016-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
6017+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
6018 # at #
6019 use `new_test3`/*!*/;
6020 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
6021@@ -392,7 +392,7 @@ CREATE TABLE t3 (a INT)
6022 /*!*/;
6023 # at #
6024 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-7
6025-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
6026+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
6027 START TRANSACTION
6028 /*!*/;
6029 # at #
6030@@ -416,7 +416,7 @@ COMMIT
6031 /*!*/;
6032 # at #
6033 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-8
6034-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
6035+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
6036 START TRANSACTION
6037 /*!*/;
6038 # at #
6039@@ -438,7 +438,7 @@ COMMIT
6040 /*!*/;
6041 # at #
6042 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-9
6043-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
6044+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
6045 START TRANSACTION
6046 /*!*/;
6047 # at #
6048@@ -477,7 +477,7 @@ COMMIT
6049 /*!*/;
6050 # at #
6051 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-10
6052-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
6053+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
6054 START TRANSACTION
6055 /*!*/;
6056 # at #
6057diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
6058index e449025e..2a7236e7 100644
6059--- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
6060+++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
6061@@ -85,10 +85,10 @@ DELIMITER /*!*/;
6062 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000003
6063 # at #
6064 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl
6065-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6066-/*!100001 SET @@session.gtid_domain_id=#*//*!*/;
6067-/*!100001 SET @@session.server_id=#*//*!*/;
6068-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6069+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6070+/*M!100001 SET @@session.gtid_domain_id=#*//*!*/;
6071+/*M!100001 SET @@session.server_id=#*//*!*/;
6072+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6073 # at #
6074 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
6075 use `test`/*!*/;
6076@@ -105,7 +105,7 @@ CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8)
6077 /*!*/;
6078 # at #
6079 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
6080-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6081+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6082 START TRANSACTION
6083 /*!*/;
6084 # at #
6085@@ -120,7 +120,7 @@ COMMIT
6086 /*!*/;
6087 # at #
6088 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
6089-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6090+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6091 START TRANSACTION
6092 /*!*/;
6093 # at #
6094@@ -135,7 +135,7 @@ COMMIT
6095 /*!*/;
6096 # at #
6097 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
6098-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6099+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6100 START TRANSACTION
6101 /*!*/;
6102 # at #
6103@@ -150,7 +150,7 @@ COMMIT
6104 /*!*/;
6105 # at #
6106 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
6107-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6108+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6109 START TRANSACTION
6110 /*!*/;
6111 # at #
6112@@ -165,7 +165,7 @@ COMMIT
6113 /*!*/;
6114 # at #
6115 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
6116-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6117+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6118 START TRANSACTION
6119 /*!*/;
6120 # at #
6121@@ -180,7 +180,7 @@ COMMIT
6122 /*!*/;
6123 # at #
6124 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-#
6125-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6126+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6127 START TRANSACTION
6128 /*!*/;
6129 # at #
6130@@ -195,7 +195,7 @@ COMMIT
6131 /*!*/;
6132 # at #
6133 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX GTID #-#-# ddl
6134-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
6135+/*M!100001 SET @@session.gtid_seq_no=#*//*!*/;
6136 # at #
6137 #YYMMDD HH:MM:SS server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
6138 SET TIMESTAMP=XXX/*!*/;
6139diff --git a/mysql-test/suite/binlog/r/flashback.result b/mysql-test/suite/binlog/r/flashback.result
6140index 7d65a8ec..dcedd08e 100644
6141--- a/mysql-test/suite/binlog/r/flashback.result
6142+++ b/mysql-test/suite/binlog/r/flashback.result
6143@@ -51,10 +51,10 @@ ROLLBACK/*!*/;
6144 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX Binlog checkpoint master-bin.000001
6145 # at #
6146 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-1 ddl
6147-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6148-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
6149-/*!100001 SET @@session.server_id=1*//*!*/;
6150-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
6151+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6152+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
6153+/*M!100001 SET @@session.server_id=1*//*!*/;
6154+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
6155 # at #
6156 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
6157 use `test`/*!*/;
6158@@ -80,7 +80,7 @@ c08 TEXT
6159 /*!*/;
6160 # at #
6161 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-2 trans
6162-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
6163+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
6164 START TRANSACTION
6165 /*!*/;
6166 # at #
6167@@ -106,7 +106,7 @@ START TRANSACTION
6168 COMMIT/*!*/;
6169 # at #
6170 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-3 trans
6171-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
6172+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
6173 START TRANSACTION
6174 /*!*/;
6175 # at #
6176@@ -132,7 +132,7 @@ START TRANSACTION
6177 COMMIT/*!*/;
6178 # at #
6179 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-4 trans
6180-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
6181+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
6182 START TRANSACTION
6183 /*!*/;
6184 # at #
6185@@ -158,7 +158,7 @@ START TRANSACTION
6186 COMMIT/*!*/;
6187 # at #
6188 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-5 trans
6189-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
6190+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
6191 START TRANSACTION
6192 /*!*/;
6193 # at #
6194@@ -212,7 +212,7 @@ START TRANSACTION
6195 COMMIT/*!*/;
6196 # at #
6197 #010909 9:46:40 server id 1 end_log_pos # CRC32 XXX GTID 0-1-6 trans
6198-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
6199+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
6200 START TRANSACTION
6201 /*!*/;
6202 # at #
6203diff --git a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result
6204index 80b9c5d4..9516f230 100644
6205--- a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result
6206+++ b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result
6207@@ -112,10 +112,10 @@ ROLLBACK/*!*/;
6208 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
6209 # at #
6210 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
6211-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6212-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
6213-/*!100001 SET @@session.server_id=1*//*!*/;
6214-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
6215+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6216+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
6217+/*M!100001 SET @@session.server_id=1*//*!*/;
6218+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
6219 # at #
6220 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
6221 SET TIMESTAMP=1000000000/*!*/;
6222@@ -131,7 +131,7 @@ CREATE DATABASE test1
6223 /*!*/;
6224 # at #
6225 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
6226-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
6227+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
6228 # at #
6229 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
6230 SET TIMESTAMP=1000000000/*!*/;
6231@@ -139,7 +139,7 @@ CREATE DATABASE test2
6232 /*!*/;
6233 # at #
6234 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
6235-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
6236+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
6237 # at #
6238 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
6239 SET TIMESTAMP=1000000000/*!*/;
6240@@ -147,7 +147,7 @@ CREATE DATABASE test3
6241 /*!*/;
6242 # at #
6243 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
6244-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
6245+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
6246 START TRANSACTION
6247 /*!*/;
6248 # at #
6249@@ -174,7 +174,7 @@ COMMIT
6250 /*!*/;
6251 # at #
6252 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
6253-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
6254+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
6255 START TRANSACTION
6256 /*!*/;
6257 # at #
6258@@ -201,7 +201,7 @@ COMMIT
6259 /*!*/;
6260 # at #
6261 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
6262-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
6263+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
6264 START TRANSACTION
6265 /*!*/;
6266 # at #
6267@@ -228,7 +228,7 @@ COMMIT
6268 /*!*/;
6269 # at #
6270 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
6271-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
6272+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
6273 START TRANSACTION
6274 /*!*/;
6275 # at #
6276@@ -270,7 +270,7 @@ COMMIT
6277 /*!*/;
6278 # at #
6279 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
6280-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
6281+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
6282 START TRANSACTION
6283 /*!*/;
6284 # at #
6285@@ -297,7 +297,7 @@ COMMIT
6286 /*!*/;
6287 # at #
6288 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
6289-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
6290+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
6291 START TRANSACTION
6292 /*!*/;
6293 # at #
6294@@ -353,10 +353,10 @@ ROLLBACK/*!*/;
6295 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
6296 # at #
6297 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
6298-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6299-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
6300-/*!100001 SET @@session.server_id=1*//*!*/;
6301-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
6302+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6303+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
6304+/*M!100001 SET @@session.server_id=1*//*!*/;
6305+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
6306 # at #
6307 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
6308 SET TIMESTAMP=1000000000/*!*/;
6309@@ -372,15 +372,15 @@ CREATE DATABASE test1
6310 /*!*/;
6311 # at #
6312 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
6313-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
6314+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
6315 # at #
6316 # at #
6317 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
6318-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
6319+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
6320 # at #
6321 # at #
6322 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
6323-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
6324+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
6325 START TRANSACTION
6326 /*!*/;
6327 # at #
6328@@ -407,7 +407,7 @@ COMMIT
6329 /*!*/;
6330 # at #
6331 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
6332-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
6333+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
6334 START TRANSACTION
6335 /*!*/;
6336 # at #
6337@@ -420,7 +420,7 @@ COMMIT
6338 /*!*/;
6339 # at #
6340 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
6341-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
6342+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
6343 START TRANSACTION
6344 /*!*/;
6345 # at #
6346@@ -433,7 +433,7 @@ COMMIT
6347 /*!*/;
6348 # at #
6349 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
6350-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
6351+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
6352 START TRANSACTION
6353 /*!*/;
6354 # at #
6355@@ -463,7 +463,7 @@ COMMIT
6356 /*!*/;
6357 # at #
6358 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
6359-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
6360+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
6361 START TRANSACTION
6362 /*!*/;
6363 # at #
6364@@ -476,7 +476,7 @@ COMMIT
6365 /*!*/;
6366 # at #
6367 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
6368-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
6369+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
6370 START TRANSACTION
6371 /*!*/;
6372 # at #
6373@@ -515,10 +515,10 @@ ROLLBACK/*!*/;
6374 #010909 4:46:40 server id # end_log_pos # Binlog checkpoint master-bin.000001
6375 # at #
6376 #010909 4:46:40 server id # end_log_pos # GTID 0-1-1 ddl
6377-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6378-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
6379-/*!100001 SET @@session.server_id=1*//*!*/;
6380-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
6381+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
6382+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
6383+/*M!100001 SET @@session.server_id=1*//*!*/;
6384+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
6385 # at #
6386 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
6387 SET TIMESTAMP=1000000000/*!*/;
6388@@ -534,7 +534,7 @@ CREATE DATABASE test1
6389 /*!*/;
6390 # at #
6391 #010909 4:46:40 server id # end_log_pos # GTID 0-1-2 ddl
6392-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
6393+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
6394 # at #
6395 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
6396 SET TIMESTAMP=1000000000/*!*/;
6397@@ -542,7 +542,7 @@ CREATE DATABASE test2
6398 /*!*/;
6399 # at #
6400 #010909 4:46:40 server id # end_log_pos # GTID 0-1-3 ddl
6401-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
6402+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
6403 # at #
6404 #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid>
6405 SET TIMESTAMP=1000000000/*!*/;
6406@@ -550,7 +550,7 @@ CREATE DATABASE test3
6407 /*!*/;
6408 # at #
6409 #010909 4:46:40 server id # end_log_pos # GTID 0-1-4
6410-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
6411+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
6412 START TRANSACTION
6413 /*!*/;
6414 # at #
6415@@ -574,7 +574,7 @@ COMMIT
6416 /*!*/;
6417 # at #
6418 #010909 4:46:40 server id # end_log_pos # GTID 0-1-5
6419-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
6420+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
6421 START TRANSACTION
6422 /*!*/;
6423 # at #
6424@@ -598,7 +598,7 @@ COMMIT
6425 /*!*/;
6426 # at #
6427 #010909 4:46:40 server id # end_log_pos # GTID 0-1-6
6428-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
6429+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
6430 START TRANSACTION
6431 /*!*/;
6432 # at #
6433@@ -622,7 +622,7 @@ COMMIT
6434 /*!*/;
6435 # at #
6436 #010909 4:46:40 server id # end_log_pos # GTID 0-1-7
6437-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
6438+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
6439 START TRANSACTION
6440 /*!*/;
6441 # at #
6442@@ -659,7 +659,7 @@ COMMIT
6443 /*!*/;
6444 # at #
6445 #010909 4:46:40 server id # end_log_pos # GTID 0-1-8
6446-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
6447+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
6448 START TRANSACTION
6449 /*!*/;
6450 # at #
6451@@ -683,7 +683,7 @@ COMMIT
6452 /*!*/;
6453 # at #
6454 #010909 4:46:40 server id # end_log_pos # GTID 0-1-9
6455-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
6456+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
6457 START TRANSACTION
6458 /*!*/;
6459 # at #
6460diff --git a/mysql-test/suite/compat/oracle/r/column_compression.result b/mysql-test/suite/compat/oracle/r/column_compression.result
6461index 2709fe04..ab11e364 100644
6462--- a/mysql-test/suite/compat/oracle/r/column_compression.result
6463+++ b/mysql-test/suite/compat/oracle/r/column_compression.result
6464@@ -24,10 +24,10 @@ d TINYTEXT COMPRESSED BINARY
6465 SHOW CREATE TABLE t1;
6466 Table Create Table
6467 t1 CREATE TABLE "t1" (
6468- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid("a")),
6469- "b" varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
6470- "c" varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
6471- "d" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6472+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid("a")),
6473+ "b" varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
6474+ "c" varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
6475+ "d" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6476 )
6477 DROP TABLE t1;
6478 #
6479@@ -41,49 +41,49 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED);
6480 SHOW CREATE TABLE t1;
6481 Table Create Table
6482 t1 CREATE TABLE "t1" (
6483- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6484+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6485 )
6486 DROP TABLE t1;
6487 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY);
6488 SHOW CREATE TABLE t1;
6489 Table Create Table
6490 t1 CREATE TABLE "t1" (
6491- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6492+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6493 )
6494 DROP TABLE t1;
6495 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY ASCII);
6496 SHOW CREATE TABLE t1;
6497 Table Create Table
6498 t1 CREATE TABLE "t1" (
6499- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6500+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6501 )
6502 DROP TABLE t1;
6503 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE);
6504 SHOW CREATE TABLE t1;
6505 Table Create Table
6506 t1 CREATE TABLE "t1" (
6507- "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6508+ "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6509 )
6510 DROP TABLE t1;
6511 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII);
6512 SHOW CREATE TABLE t1;
6513 Table Create Table
6514 t1 CREATE TABLE "t1" (
6515- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6516+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6517 )
6518 DROP TABLE t1;
6519 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED UNICODE);
6520 SHOW CREATE TABLE t1;
6521 Table Create Table
6522 t1 CREATE TABLE "t1" (
6523- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6524+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6525 )
6526 DROP TABLE t1;
6527 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8);
6528 SHOW CREATE TABLE t1;
6529 Table Create Table
6530 t1 CREATE TABLE "t1" (
6531- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6532+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6533 )
6534 DROP TABLE t1;
6535 #
6536@@ -94,35 +94,35 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BYTE DEFAULT '');
6537 SHOW CREATE TABLE t1;
6538 Table Create Table
6539 t1 CREATE TABLE "t1" (
6540- "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT ''
6541+ "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT ''
6542 )
6543 DROP TABLE t1;
6544 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED BINARY DEFAULT '');
6545 SHOW CREATE TABLE t1;
6546 Table Create Table
6547 t1 CREATE TABLE "t1" (
6548- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6549+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6550 )
6551 DROP TABLE t1;
6552 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED ASCII DEFAULT '');
6553 SHOW CREATE TABLE t1;
6554 Table Create Table
6555 t1 CREATE TABLE "t1" (
6556- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT ''
6557+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT ''
6558 )
6559 DROP TABLE t1;
6560 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 DEFAULT '');
6561 SHOW CREATE TABLE t1;
6562 Table Create Table
6563 t1 CREATE TABLE "t1" (
6564- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6565+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6566 )
6567 DROP TABLE t1;
6568 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
6569 SHOW CREATE TABLE t1;
6570 Table Create Table
6571 t1 CREATE TABLE "t1" (
6572- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6573+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6574 )
6575 DROP TABLE t1;
6576 #
6577@@ -134,7 +134,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6578 SHOW CREATE TABLE t1;
6579 Table Create Table
6580 t1 CREATE TABLE "t1" (
6581- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6582+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6583 )
6584 DROP TABLE t1;
6585 CREATE TABLE t1 (a VARCHAR(10) ASCII COMPRESSED);
6586@@ -143,7 +143,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6587 SHOW CREATE TABLE t1;
6588 Table Create Table
6589 t1 CREATE TABLE "t1" (
6590- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6591+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6592 )
6593 DROP TABLE t1;
6594 CREATE TABLE t1 (a VARCHAR(10) BYTE COMPRESSED);
6595@@ -152,7 +152,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6596 SHOW CREATE TABLE t1;
6597 Table Create Table
6598 t1 CREATE TABLE "t1" (
6599- "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6600+ "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6601 )
6602 DROP TABLE t1;
6603 #
6604@@ -192,49 +192,49 @@ CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED);
6605 SHOW CREATE TABLE t1;
6606 Table Create Table
6607 t1 CREATE TABLE "t1" (
6608- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6609+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6610 )
6611 DROP TABLE t1;
6612 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BINARY);
6613 SHOW CREATE TABLE t1;
6614 Table Create Table
6615 t1 CREATE TABLE "t1" (
6616- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6617+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6618 )
6619 DROP TABLE t1;
6620 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BINARY ASCII);
6621 SHOW CREATE TABLE t1;
6622 Table Create Table
6623 t1 CREATE TABLE "t1" (
6624- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6625+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6626 )
6627 DROP TABLE t1;
6628 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BYTE);
6629 SHOW CREATE TABLE t1;
6630 Table Create Table
6631 t1 CREATE TABLE "t1" (
6632- "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6633+ "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6634 )
6635 DROP TABLE t1;
6636 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED ASCII);
6637 SHOW CREATE TABLE t1;
6638 Table Create Table
6639 t1 CREATE TABLE "t1" (
6640- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6641+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6642 )
6643 DROP TABLE t1;
6644 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED UNICODE);
6645 SHOW CREATE TABLE t1;
6646 Table Create Table
6647 t1 CREATE TABLE "t1" (
6648- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6649+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6650 )
6651 DROP TABLE t1;
6652 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8);
6653 SHOW CREATE TABLE t1;
6654 Table Create Table
6655 t1 CREATE TABLE "t1" (
6656- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6657+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6658 )
6659 DROP TABLE t1;
6660 #
6661@@ -245,35 +245,35 @@ CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BYTE DEFAULT '');
6662 SHOW CREATE TABLE t1;
6663 Table Create Table
6664 t1 CREATE TABLE "t1" (
6665- "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT ''
6666+ "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT ''
6667 )
6668 DROP TABLE t1;
6669 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED BINARY DEFAULT '');
6670 SHOW CREATE TABLE t1;
6671 Table Create Table
6672 t1 CREATE TABLE "t1" (
6673- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6674+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6675 )
6676 DROP TABLE t1;
6677 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED ASCII DEFAULT '');
6678 SHOW CREATE TABLE t1;
6679 Table Create Table
6680 t1 CREATE TABLE "t1" (
6681- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT ''
6682+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT ''
6683 )
6684 DROP TABLE t1;
6685 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8 DEFAULT '');
6686 SHOW CREATE TABLE t1;
6687 Table Create Table
6688 t1 CREATE TABLE "t1" (
6689- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6690+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6691 )
6692 DROP TABLE t1;
6693 CREATE TABLE t1 (a VARCHAR2(10) COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
6694 SHOW CREATE TABLE t1;
6695 Table Create Table
6696 t1 CREATE TABLE "t1" (
6697- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6698+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6699 )
6700 DROP TABLE t1;
6701 #
6702@@ -285,7 +285,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6703 SHOW CREATE TABLE t1;
6704 Table Create Table
6705 t1 CREATE TABLE "t1" (
6706- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6707+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6708 )
6709 DROP TABLE t1;
6710 CREATE TABLE t1 (a VARCHAR2(10) ASCII COMPRESSED);
6711@@ -294,7 +294,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6712 SHOW CREATE TABLE t1;
6713 Table Create Table
6714 t1 CREATE TABLE "t1" (
6715- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6716+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6717 )
6718 DROP TABLE t1;
6719 CREATE TABLE t1 (a VARCHAR2(10) BYTE COMPRESSED);
6720@@ -303,7 +303,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6721 SHOW CREATE TABLE t1;
6722 Table Create Table
6723 t1 CREATE TABLE "t1" (
6724- "a" varbinary(10) /*!100301 COMPRESSED*/ DEFAULT NULL
6725+ "a" varbinary(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
6726 )
6727 DROP TABLE t1;
6728 #
6729@@ -343,49 +343,49 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED);
6730 SHOW CREATE TABLE t1;
6731 Table Create Table
6732 t1 CREATE TABLE "t1" (
6733- "a" tinytext /*!100301 COMPRESSED*/ DEFAULT NULL
6734+ "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL
6735 )
6736 DROP TABLE t1;
6737 CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY);
6738 SHOW CREATE TABLE t1;
6739 Table Create Table
6740 t1 CREATE TABLE "t1" (
6741- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6742+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6743 )
6744 DROP TABLE t1;
6745 CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY ASCII);
6746 SHOW CREATE TABLE t1;
6747 Table Create Table
6748 t1 CREATE TABLE "t1" (
6749- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6750+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6751 )
6752 DROP TABLE t1;
6753 CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE);
6754 SHOW CREATE TABLE t1;
6755 Table Create Table
6756 t1 CREATE TABLE "t1" (
6757- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
6758+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
6759 )
6760 DROP TABLE t1;
6761 CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII);
6762 SHOW CREATE TABLE t1;
6763 Table Create Table
6764 t1 CREATE TABLE "t1" (
6765- "a" tinytext /*!100301 COMPRESSED*/ DEFAULT NULL
6766+ "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL
6767 )
6768 DROP TABLE t1;
6769 CREATE TABLE t1 (a TINYTEXT COMPRESSED UNICODE);
6770 SHOW CREATE TABLE t1;
6771 Table Create Table
6772 t1 CREATE TABLE "t1" (
6773- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6774+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6775 )
6776 DROP TABLE t1;
6777 CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8);
6778 SHOW CREATE TABLE t1;
6779 Table Create Table
6780 t1 CREATE TABLE "t1" (
6781- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6782+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6783 )
6784 DROP TABLE t1;
6785 #
6786@@ -396,35 +396,35 @@ CREATE TABLE t1 (a TINYTEXT COMPRESSED BYTE DEFAULT '');
6787 SHOW CREATE TABLE t1;
6788 Table Create Table
6789 t1 CREATE TABLE "t1" (
6790- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT ''
6791+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT ''
6792 )
6793 DROP TABLE t1;
6794 CREATE TABLE t1 (a TINYTEXT COMPRESSED BINARY DEFAULT '');
6795 SHOW CREATE TABLE t1;
6796 Table Create Table
6797 t1 CREATE TABLE "t1" (
6798- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6799+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6800 )
6801 DROP TABLE t1;
6802 CREATE TABLE t1 (a TINYTEXT COMPRESSED ASCII DEFAULT '');
6803 SHOW CREATE TABLE t1;
6804 Table Create Table
6805 t1 CREATE TABLE "t1" (
6806- "a" tinytext /*!100301 COMPRESSED*/ DEFAULT ''
6807+ "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT ''
6808 )
6809 DROP TABLE t1;
6810 CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
6811 SHOW CREATE TABLE t1;
6812 Table Create Table
6813 t1 CREATE TABLE "t1" (
6814- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6815+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6816 )
6817 DROP TABLE t1;
6818 CREATE TABLE t1 (a TINYTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
6819 SHOW CREATE TABLE t1;
6820 Table Create Table
6821 t1 CREATE TABLE "t1" (
6822- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6823+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6824 )
6825 DROP TABLE t1;
6826 #
6827@@ -436,7 +436,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6828 SHOW CREATE TABLE t1;
6829 Table Create Table
6830 t1 CREATE TABLE "t1" (
6831- "a" tinytext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6832+ "a" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6833 )
6834 DROP TABLE t1;
6835 CREATE TABLE t1 (a TINYTEXT ASCII COMPRESSED);
6836@@ -445,7 +445,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6837 SHOW CREATE TABLE t1;
6838 Table Create Table
6839 t1 CREATE TABLE "t1" (
6840- "a" tinytext /*!100301 COMPRESSED*/ DEFAULT NULL
6841+ "a" tinytext /*M!100301 COMPRESSED*/ DEFAULT NULL
6842 )
6843 DROP TABLE t1;
6844 CREATE TABLE t1 (a TINYTEXT BYTE COMPRESSED);
6845@@ -454,7 +454,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6846 SHOW CREATE TABLE t1;
6847 Table Create Table
6848 t1 CREATE TABLE "t1" (
6849- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
6850+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
6851 )
6852 DROP TABLE t1;
6853 #
6854@@ -494,49 +494,49 @@ CREATE TABLE t1 (a TEXT COMPRESSED);
6855 SHOW CREATE TABLE t1;
6856 Table Create Table
6857 t1 CREATE TABLE "t1" (
6858- "a" text /*!100301 COMPRESSED*/ DEFAULT NULL
6859+ "a" text /*M!100301 COMPRESSED*/ DEFAULT NULL
6860 )
6861 DROP TABLE t1;
6862 CREATE TABLE t1 (a TEXT COMPRESSED BINARY);
6863 SHOW CREATE TABLE t1;
6864 Table Create Table
6865 t1 CREATE TABLE "t1" (
6866- "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6867+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6868 )
6869 DROP TABLE t1;
6870 CREATE TABLE t1 (a TEXT COMPRESSED BINARY ASCII);
6871 SHOW CREATE TABLE t1;
6872 Table Create Table
6873 t1 CREATE TABLE "t1" (
6874- "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6875+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6876 )
6877 DROP TABLE t1;
6878 CREATE TABLE t1 (a TEXT COMPRESSED BYTE);
6879 SHOW CREATE TABLE t1;
6880 Table Create Table
6881 t1 CREATE TABLE "t1" (
6882- "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL
6883+ "a" blob(65535) /*M!100301 COMPRESSED*/ DEFAULT NULL
6884 )
6885 DROP TABLE t1;
6886 CREATE TABLE t1 (a TEXT COMPRESSED ASCII);
6887 SHOW CREATE TABLE t1;
6888 Table Create Table
6889 t1 CREATE TABLE "t1" (
6890- "a" text /*!100301 COMPRESSED*/ DEFAULT NULL
6891+ "a" text /*M!100301 COMPRESSED*/ DEFAULT NULL
6892 )
6893 DROP TABLE t1;
6894 CREATE TABLE t1 (a TEXT COMPRESSED UNICODE);
6895 SHOW CREATE TABLE t1;
6896 Table Create Table
6897 t1 CREATE TABLE "t1" (
6898- "a" text /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6899+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
6900 )
6901 DROP TABLE t1;
6902 CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8);
6903 SHOW CREATE TABLE t1;
6904 Table Create Table
6905 t1 CREATE TABLE "t1" (
6906- "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6907+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
6908 )
6909 DROP TABLE t1;
6910 #
6911@@ -547,35 +547,35 @@ CREATE TABLE t1 (a TEXT COMPRESSED BYTE DEFAULT '');
6912 SHOW CREATE TABLE t1;
6913 Table Create Table
6914 t1 CREATE TABLE "t1" (
6915- "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT ''
6916+ "a" blob(65535) /*M!100301 COMPRESSED*/ DEFAULT ''
6917 )
6918 DROP TABLE t1;
6919 CREATE TABLE t1 (a TEXT COMPRESSED BINARY DEFAULT '');
6920 SHOW CREATE TABLE t1;
6921 Table Create Table
6922 t1 CREATE TABLE "t1" (
6923- "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6924+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
6925 )
6926 DROP TABLE t1;
6927 CREATE TABLE t1 (a TEXT COMPRESSED ASCII DEFAULT '');
6928 SHOW CREATE TABLE t1;
6929 Table Create Table
6930 t1 CREATE TABLE "t1" (
6931- "a" text /*!100301 COMPRESSED*/ DEFAULT ''
6932+ "a" text /*M!100301 COMPRESSED*/ DEFAULT ''
6933 )
6934 DROP TABLE t1;
6935 CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
6936 SHOW CREATE TABLE t1;
6937 Table Create Table
6938 t1 CREATE TABLE "t1" (
6939- "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6940+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
6941 )
6942 DROP TABLE t1;
6943 CREATE TABLE t1 (a TEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
6944 SHOW CREATE TABLE t1;
6945 Table Create Table
6946 t1 CREATE TABLE "t1" (
6947- "a" text /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6948+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
6949 )
6950 DROP TABLE t1;
6951 #
6952@@ -587,7 +587,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6953 SHOW CREATE TABLE t1;
6954 Table Create Table
6955 t1 CREATE TABLE "t1" (
6956- "a" text /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6957+ "a" text /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6958 )
6959 DROP TABLE t1;
6960 CREATE TABLE t1 (a TEXT ASCII COMPRESSED);
6961@@ -596,7 +596,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6962 SHOW CREATE TABLE t1;
6963 Table Create Table
6964 t1 CREATE TABLE "t1" (
6965- "a" text /*!100301 COMPRESSED*/ DEFAULT NULL
6966+ "a" text /*M!100301 COMPRESSED*/ DEFAULT NULL
6967 )
6968 DROP TABLE t1;
6969 CREATE TABLE t1 (a TEXT BYTE COMPRESSED);
6970@@ -605,7 +605,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
6971 SHOW CREATE TABLE t1;
6972 Table Create Table
6973 t1 CREATE TABLE "t1" (
6974- "a" blob(65535) /*!100301 COMPRESSED*/ DEFAULT NULL
6975+ "a" blob(65535) /*M!100301 COMPRESSED*/ DEFAULT NULL
6976 )
6977 DROP TABLE t1;
6978 #
6979@@ -645,49 +645,49 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED);
6980 SHOW CREATE TABLE t1;
6981 Table Create Table
6982 t1 CREATE TABLE "t1" (
6983- "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL
6984+ "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL
6985 )
6986 DROP TABLE t1;
6987 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY);
6988 SHOW CREATE TABLE t1;
6989 Table Create Table
6990 t1 CREATE TABLE "t1" (
6991- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6992+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
6993 )
6994 DROP TABLE t1;
6995 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY ASCII);
6996 SHOW CREATE TABLE t1;
6997 Table Create Table
6998 t1 CREATE TABLE "t1" (
6999- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7000+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7001 )
7002 DROP TABLE t1;
7003 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE);
7004 SHOW CREATE TABLE t1;
7005 Table Create Table
7006 t1 CREATE TABLE "t1" (
7007- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
7008+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7009 )
7010 DROP TABLE t1;
7011 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII);
7012 SHOW CREATE TABLE t1;
7013 Table Create Table
7014 t1 CREATE TABLE "t1" (
7015- "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL
7016+ "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL
7017 )
7018 DROP TABLE t1;
7019 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED UNICODE);
7020 SHOW CREATE TABLE t1;
7021 Table Create Table
7022 t1 CREATE TABLE "t1" (
7023- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
7024+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
7025 )
7026 DROP TABLE t1;
7027 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8);
7028 SHOW CREATE TABLE t1;
7029 Table Create Table
7030 t1 CREATE TABLE "t1" (
7031- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
7032+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
7033 )
7034 DROP TABLE t1;
7035 #
7036@@ -698,35 +698,35 @@ CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BYTE DEFAULT '');
7037 SHOW CREATE TABLE t1;
7038 Table Create Table
7039 t1 CREATE TABLE "t1" (
7040- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT ''
7041+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT ''
7042 )
7043 DROP TABLE t1;
7044 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED BINARY DEFAULT '');
7045 SHOW CREATE TABLE t1;
7046 Table Create Table
7047 t1 CREATE TABLE "t1" (
7048- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
7049+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
7050 )
7051 DROP TABLE t1;
7052 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED ASCII DEFAULT '');
7053 SHOW CREATE TABLE t1;
7054 Table Create Table
7055 t1 CREATE TABLE "t1" (
7056- "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT ''
7057+ "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT ''
7058 )
7059 DROP TABLE t1;
7060 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
7061 SHOW CREATE TABLE t1;
7062 Table Create Table
7063 t1 CREATE TABLE "t1" (
7064- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
7065+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
7066 )
7067 DROP TABLE t1;
7068 CREATE TABLE t1 (a MEDIUMTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
7069 SHOW CREATE TABLE t1;
7070 Table Create Table
7071 t1 CREATE TABLE "t1" (
7072- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
7073+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
7074 )
7075 DROP TABLE t1;
7076 #
7077@@ -738,7 +738,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7078 SHOW CREATE TABLE t1;
7079 Table Create Table
7080 t1 CREATE TABLE "t1" (
7081- "a" mediumtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7082+ "a" mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7083 )
7084 DROP TABLE t1;
7085 CREATE TABLE t1 (a MEDIUMTEXT ASCII COMPRESSED);
7086@@ -747,7 +747,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7087 SHOW CREATE TABLE t1;
7088 Table Create Table
7089 t1 CREATE TABLE "t1" (
7090- "a" mediumtext /*!100301 COMPRESSED*/ DEFAULT NULL
7091+ "a" mediumtext /*M!100301 COMPRESSED*/ DEFAULT NULL
7092 )
7093 DROP TABLE t1;
7094 CREATE TABLE t1 (a MEDIUMTEXT BYTE COMPRESSED);
7095@@ -756,7 +756,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7096 SHOW CREATE TABLE t1;
7097 Table Create Table
7098 t1 CREATE TABLE "t1" (
7099- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
7100+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7101 )
7102 DROP TABLE t1;
7103 #
7104@@ -796,49 +796,49 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED);
7105 SHOW CREATE TABLE t1;
7106 Table Create Table
7107 t1 CREATE TABLE "t1" (
7108- "a" longtext /*!100301 COMPRESSED*/ DEFAULT NULL
7109+ "a" longtext /*M!100301 COMPRESSED*/ DEFAULT NULL
7110 )
7111 DROP TABLE t1;
7112 CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY);
7113 SHOW CREATE TABLE t1;
7114 Table Create Table
7115 t1 CREATE TABLE "t1" (
7116- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7117+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7118 )
7119 DROP TABLE t1;
7120 CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY ASCII);
7121 SHOW CREATE TABLE t1;
7122 Table Create Table
7123 t1 CREATE TABLE "t1" (
7124- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7125+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7126 )
7127 DROP TABLE t1;
7128 CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE);
7129 SHOW CREATE TABLE t1;
7130 Table Create Table
7131 t1 CREATE TABLE "t1" (
7132- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7133+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7134 )
7135 DROP TABLE t1;
7136 CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII);
7137 SHOW CREATE TABLE t1;
7138 Table Create Table
7139 t1 CREATE TABLE "t1" (
7140- "a" longtext /*!100301 COMPRESSED*/ DEFAULT NULL
7141+ "a" longtext /*M!100301 COMPRESSED*/ DEFAULT NULL
7142 )
7143 DROP TABLE t1;
7144 CREATE TABLE t1 (a LONGTEXT COMPRESSED UNICODE);
7145 SHOW CREATE TABLE t1;
7146 Table Create Table
7147 t1 CREATE TABLE "t1" (
7148- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
7149+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET ucs2 COLLATE ucs2_general_ci DEFAULT NULL
7150 )
7151 DROP TABLE t1;
7152 CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8);
7153 SHOW CREATE TABLE t1;
7154 Table Create Table
7155 t1 CREATE TABLE "t1" (
7156- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
7157+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
7158 )
7159 DROP TABLE t1;
7160 #
7161@@ -849,35 +849,35 @@ CREATE TABLE t1 (a LONGTEXT COMPRESSED BYTE DEFAULT '');
7162 SHOW CREATE TABLE t1;
7163 Table Create Table
7164 t1 CREATE TABLE "t1" (
7165- "a" longblob /*!100301 COMPRESSED*/ DEFAULT ''
7166+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT ''
7167 )
7168 DROP TABLE t1;
7169 CREATE TABLE t1 (a LONGTEXT COMPRESSED BINARY DEFAULT '');
7170 SHOW CREATE TABLE t1;
7171 Table Create Table
7172 t1 CREATE TABLE "t1" (
7173- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
7174+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT ''
7175 )
7176 DROP TABLE t1;
7177 CREATE TABLE t1 (a LONGTEXT COMPRESSED ASCII DEFAULT '');
7178 SHOW CREATE TABLE t1;
7179 Table Create Table
7180 t1 CREATE TABLE "t1" (
7181- "a" longtext /*!100301 COMPRESSED*/ DEFAULT ''
7182+ "a" longtext /*M!100301 COMPRESSED*/ DEFAULT ''
7183 )
7184 DROP TABLE t1;
7185 CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 DEFAULT '');
7186 SHOW CREATE TABLE t1;
7187 Table Create Table
7188 t1 CREATE TABLE "t1" (
7189- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
7190+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT ''
7191 )
7192 DROP TABLE t1;
7193 CREATE TABLE t1 (a LONGTEXT COMPRESSED CHARACTER SET utf8 GENERATED ALWAYS AS (REPEAT('a',100)));
7194 SHOW CREATE TABLE t1;
7195 Table Create Table
7196 t1 CREATE TABLE "t1" (
7197- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
7198+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci GENERATED ALWAYS AS (repeat('a',100)) VIRTUAL
7199 )
7200 DROP TABLE t1;
7201 #
7202@@ -889,7 +889,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7203 SHOW CREATE TABLE t1;
7204 Table Create Table
7205 t1 CREATE TABLE "t1" (
7206- "a" longtext /*!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7207+ "a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
7208 )
7209 DROP TABLE t1;
7210 CREATE TABLE t1 (a LONGTEXT ASCII COMPRESSED);
7211@@ -898,7 +898,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7212 SHOW CREATE TABLE t1;
7213 Table Create Table
7214 t1 CREATE TABLE "t1" (
7215- "a" longtext /*!100301 COMPRESSED*/ DEFAULT NULL
7216+ "a" longtext /*M!100301 COMPRESSED*/ DEFAULT NULL
7217 )
7218 DROP TABLE t1;
7219 CREATE TABLE t1 (a LONGTEXT BYTE COMPRESSED);
7220@@ -907,7 +907,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7221 SHOW CREATE TABLE t1;
7222 Table Create Table
7223 t1 CREATE TABLE "t1" (
7224- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7225+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7226 )
7227 DROP TABLE t1;
7228 #
7229@@ -949,7 +949,7 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED);
7230 SHOW CREATE TABLE t1;
7231 Table Create Table
7232 t1 CREATE TABLE "t1" (
7233- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
7234+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
7235 )
7236 DROP TABLE t1;
7237 #
7238@@ -960,21 +960,21 @@ CREATE TABLE t1 (a VARCHAR(10) COMPRESSED DEFAULT '');
7239 SHOW CREATE TABLE t1;
7240 Table Create Table
7241 t1 CREATE TABLE "t1" (
7242- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT ''
7243+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT ''
7244 )
7245 DROP TABLE t1;
7246 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED NULL);
7247 SHOW CREATE TABLE t1;
7248 Table Create Table
7249 t1 CREATE TABLE "t1" (
7250- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
7251+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
7252 )
7253 DROP TABLE t1;
7254 CREATE TABLE t1 (a VARCHAR(10) COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
7255 SHOW CREATE TABLE t1;
7256 Table Create Table
7257 t1 CREATE TABLE "t1" (
7258- "a" varchar(10) /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7259+ "a" varchar(10) /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7260 )
7261 DROP TABLE t1;
7262 #
7263@@ -986,7 +986,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7264 SHOW CREATE TABLE t1;
7265 Table Create Table
7266 t1 CREATE TABLE "t1" (
7267- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT ''
7268+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT ''
7269 )
7270 DROP TABLE t1;
7271 CREATE TABLE t1 (a VARCHAR(10) NULL COMPRESSED);
7272@@ -995,7 +995,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7273 SHOW CREATE TABLE t1;
7274 Table Create Table
7275 t1 CREATE TABLE "t1" (
7276- "a" varchar(10) /*!100301 COMPRESSED*/ DEFAULT NULL
7277+ "a" varchar(10) /*M!100301 COMPRESSED*/ DEFAULT NULL
7278 )
7279 DROP TABLE t1;
7280 #
7281@@ -1024,7 +1024,7 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED);
7282 SHOW CREATE TABLE t1;
7283 Table Create Table
7284 t1 CREATE TABLE "t1" (
7285- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
7286+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7287 )
7288 DROP TABLE t1;
7289 #
7290@@ -1035,21 +1035,21 @@ CREATE TABLE t1 (a TINYBLOB COMPRESSED DEFAULT '');
7291 SHOW CREATE TABLE t1;
7292 Table Create Table
7293 t1 CREATE TABLE "t1" (
7294- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT ''
7295+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT ''
7296 )
7297 DROP TABLE t1;
7298 CREATE TABLE t1 (a TINYBLOB COMPRESSED NULL);
7299 SHOW CREATE TABLE t1;
7300 Table Create Table
7301 t1 CREATE TABLE "t1" (
7302- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
7303+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7304 )
7305 DROP TABLE t1;
7306 CREATE TABLE t1 (a TINYBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
7307 SHOW CREATE TABLE t1;
7308 Table Create Table
7309 t1 CREATE TABLE "t1" (
7310- "a" tinyblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7311+ "a" tinyblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7312 )
7313 DROP TABLE t1;
7314 #
7315@@ -1061,7 +1061,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7316 SHOW CREATE TABLE t1;
7317 Table Create Table
7318 t1 CREATE TABLE "t1" (
7319- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT ''
7320+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT ''
7321 )
7322 DROP TABLE t1;
7323 CREATE TABLE t1 (a TINYBLOB NULL COMPRESSED);
7324@@ -1070,7 +1070,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7325 SHOW CREATE TABLE t1;
7326 Table Create Table
7327 t1 CREATE TABLE "t1" (
7328- "a" tinyblob /*!100301 COMPRESSED*/ DEFAULT NULL
7329+ "a" tinyblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7330 )
7331 DROP TABLE t1;
7332 #
7333@@ -1099,7 +1099,7 @@ CREATE TABLE t1 (a BLOB COMPRESSED);
7334 SHOW CREATE TABLE t1;
7335 Table Create Table
7336 t1 CREATE TABLE "t1" (
7337- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7338+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7339 )
7340 DROP TABLE t1;
7341 #
7342@@ -1110,21 +1110,21 @@ CREATE TABLE t1 (a BLOB COMPRESSED DEFAULT '');
7343 SHOW CREATE TABLE t1;
7344 Table Create Table
7345 t1 CREATE TABLE "t1" (
7346- "a" longblob /*!100301 COMPRESSED*/ DEFAULT ''
7347+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT ''
7348 )
7349 DROP TABLE t1;
7350 CREATE TABLE t1 (a BLOB COMPRESSED NULL);
7351 SHOW CREATE TABLE t1;
7352 Table Create Table
7353 t1 CREATE TABLE "t1" (
7354- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7355+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7356 )
7357 DROP TABLE t1;
7358 CREATE TABLE t1 (a BLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
7359 SHOW CREATE TABLE t1;
7360 Table Create Table
7361 t1 CREATE TABLE "t1" (
7362- "a" longblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7363+ "a" longblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7364 )
7365 DROP TABLE t1;
7366 #
7367@@ -1136,7 +1136,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7368 SHOW CREATE TABLE t1;
7369 Table Create Table
7370 t1 CREATE TABLE "t1" (
7371- "a" longblob /*!100301 COMPRESSED*/ DEFAULT ''
7372+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT ''
7373 )
7374 DROP TABLE t1;
7375 CREATE TABLE t1 (a BLOB NULL COMPRESSED);
7376@@ -1145,7 +1145,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7377 SHOW CREATE TABLE t1;
7378 Table Create Table
7379 t1 CREATE TABLE "t1" (
7380- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7381+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7382 )
7383 DROP TABLE t1;
7384 #
7385@@ -1174,7 +1174,7 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED);
7386 SHOW CREATE TABLE t1;
7387 Table Create Table
7388 t1 CREATE TABLE "t1" (
7389- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
7390+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7391 )
7392 DROP TABLE t1;
7393 #
7394@@ -1185,21 +1185,21 @@ CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED DEFAULT '');
7395 SHOW CREATE TABLE t1;
7396 Table Create Table
7397 t1 CREATE TABLE "t1" (
7398- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT ''
7399+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT ''
7400 )
7401 DROP TABLE t1;
7402 CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED NULL);
7403 SHOW CREATE TABLE t1;
7404 Table Create Table
7405 t1 CREATE TABLE "t1" (
7406- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
7407+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7408 )
7409 DROP TABLE t1;
7410 CREATE TABLE t1 (a MEDIUMBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
7411 SHOW CREATE TABLE t1;
7412 Table Create Table
7413 t1 CREATE TABLE "t1" (
7414- "a" mediumblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7415+ "a" mediumblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7416 )
7417 DROP TABLE t1;
7418 #
7419@@ -1211,7 +1211,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7420 SHOW CREATE TABLE t1;
7421 Table Create Table
7422 t1 CREATE TABLE "t1" (
7423- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT ''
7424+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT ''
7425 )
7426 DROP TABLE t1;
7427 CREATE TABLE t1 (a MEDIUMBLOB NULL COMPRESSED);
7428@@ -1220,7 +1220,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7429 SHOW CREATE TABLE t1;
7430 Table Create Table
7431 t1 CREATE TABLE "t1" (
7432- "a" mediumblob /*!100301 COMPRESSED*/ DEFAULT NULL
7433+ "a" mediumblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7434 )
7435 DROP TABLE t1;
7436 #
7437@@ -1249,7 +1249,7 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED);
7438 SHOW CREATE TABLE t1;
7439 Table Create Table
7440 t1 CREATE TABLE "t1" (
7441- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7442+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7443 )
7444 DROP TABLE t1;
7445 #
7446@@ -1260,21 +1260,21 @@ CREATE TABLE t1 (a LONGBLOB COMPRESSED DEFAULT '');
7447 SHOW CREATE TABLE t1;
7448 Table Create Table
7449 t1 CREATE TABLE "t1" (
7450- "a" longblob /*!100301 COMPRESSED*/ DEFAULT ''
7451+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT ''
7452 )
7453 DROP TABLE t1;
7454 CREATE TABLE t1 (a LONGBLOB COMPRESSED NULL);
7455 SHOW CREATE TABLE t1;
7456 Table Create Table
7457 t1 CREATE TABLE "t1" (
7458- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7459+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7460 )
7461 DROP TABLE t1;
7462 CREATE TABLE t1 (a LONGBLOB COMPRESSED GENERATED ALWAYS AS (REPEAT('a',10)));
7463 SHOW CREATE TABLE t1;
7464 Table Create Table
7465 t1 CREATE TABLE "t1" (
7466- "a" longblob /*!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7467+ "a" longblob /*M!100301 COMPRESSED*/ GENERATED ALWAYS AS (repeat('a',10)) VIRTUAL
7468 )
7469 DROP TABLE t1;
7470 #
7471@@ -1286,7 +1286,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7472 SHOW CREATE TABLE t1;
7473 Table Create Table
7474 t1 CREATE TABLE "t1" (
7475- "a" longblob /*!100301 COMPRESSED*/ DEFAULT ''
7476+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT ''
7477 )
7478 DROP TABLE t1;
7479 CREATE TABLE t1 (a LONGBLOB NULL COMPRESSED);
7480@@ -1295,7 +1295,7 @@ Warning 1287 '<data type> <character set clause> ... COMPRESSED...' is deprecate
7481 SHOW CREATE TABLE t1;
7482 Table Create Table
7483 t1 CREATE TABLE "t1" (
7484- "a" longblob /*!100301 COMPRESSED*/ DEFAULT NULL
7485+ "a" longblob /*M!100301 COMPRESSED*/ DEFAULT NULL
7486 )
7487 DROP TABLE t1;
7488 #
7489@@ -1324,7 +1324,7 @@ CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED);
7490 SHOW CREATE TABLE t1;
7491 Table Create Table
7492 t1 CREATE TABLE "t1" (
7493- "a" varchar(10) /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
7494+ "a" varchar(10) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
7495 )
7496 DROP TABLE t1;
7497 CREATE TABLE t1 (a NVARCHAR(10) COMPRESSED BINARY COMPRESSED);
7498diff --git a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result
7499index 53420891..61626138 100644
7500--- a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result
7501+++ b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result
7502@@ -191,10 +191,10 @@ ROLLBACK/*!*/;
7503 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Binlog checkpoint slave-bin.000001
7504 # at #
7505 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-1 ddl
7506-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
7507-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
7508-/*!100001 SET @@session.server_id=1*//*!*/;
7509-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
7510+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
7511+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
7512+/*M!100001 SET @@session.server_id=1*//*!*/;
7513+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
7514 # at #
7515 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
7516 use `test`/*!*/;
7517@@ -211,7 +211,7 @@ CREATE TABLE t1 (a INT, b INT, c INT)
7518 /*!*/;
7519 # at #
7520 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-2 ddl
7521-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
7522+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
7523 # at #
7524 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
7525 SET TIMESTAMP=1000000000/*!*/;
7526@@ -219,8 +219,8 @@ CREATE TABLE t2 (a INT, b INT, c INT)
7527 /*!*/;
7528 # at #
7529 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-2-3 ddl
7530-/*!100001 SET @@session.server_id=2*//*!*/;
7531-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
7532+/*M!100001 SET @@session.server_id=2*//*!*/;
7533+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
7534 # at #
7535 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
7536 SET TIMESTAMP=1000000000/*!*/;
7537@@ -228,8 +228,8 @@ ALTER TABLE t1 ENGINE=BLACKHOLE
7538 /*!*/;
7539 # at #
7540 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-3 trans
7541-/*!100001 SET @@session.server_id=1*//*!*/;
7542-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
7543+/*M!100001 SET @@session.server_id=1*//*!*/;
7544+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
7545 START TRANSACTION
7546 /*!*/;
7547 # at #
7548@@ -247,7 +247,7 @@ COMMIT
7549 /*!*/;
7550 # at #
7551 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-4 trans
7552-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
7553+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
7554 START TRANSACTION
7555 /*!*/;
7556 # at #
7557@@ -265,7 +265,7 @@ COMMIT
7558 /*!*/;
7559 # at #
7560 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-5 trans
7561-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
7562+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
7563 START TRANSACTION
7564 /*!*/;
7565 # at #
7566@@ -283,7 +283,7 @@ COMMIT
7567 /*!*/;
7568 # at #
7569 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-6 trans
7570-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
7571+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
7572 START TRANSACTION
7573 /*!*/;
7574 # at #
7575@@ -301,7 +301,7 @@ COMMIT
7576 /*!*/;
7577 # at #
7578 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-7 trans
7579-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
7580+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
7581 START TRANSACTION
7582 /*!*/;
7583 # at #
7584@@ -319,7 +319,7 @@ COMMIT
7585 /*!*/;
7586 # at #
7587 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-8 ddl
7588-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
7589+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
7590 # at #
7591 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
7592 SET TIMESTAMP=1000000000/*!*/;
7593@@ -327,7 +327,7 @@ ALTER TABLE t1 ADD PRIMARY KEY pk_t1 (a,b)
7594 /*!*/;
7595 # at #
7596 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-9 trans
7597-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
7598+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
7599 START TRANSACTION
7600 /*!*/;
7601 # at #
7602@@ -345,7 +345,7 @@ COMMIT
7603 /*!*/;
7604 # at #
7605 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-10 trans
7606-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
7607+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
7608 START TRANSACTION
7609 /*!*/;
7610 # at #
7611@@ -363,7 +363,7 @@ COMMIT
7612 /*!*/;
7613 # at #
7614 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-11 trans
7615-/*!100001 SET @@session.gtid_seq_no=11*//*!*/;
7616+/*M!100001 SET @@session.gtid_seq_no=11*//*!*/;
7617 START TRANSACTION
7618 /*!*/;
7619 # at #
7620@@ -381,7 +381,7 @@ COMMIT
7621 /*!*/;
7622 # at #
7623 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-12 ddl
7624-/*!100001 SET @@session.gtid_seq_no=12*//*!*/;
7625+/*M!100001 SET @@session.gtid_seq_no=12*//*!*/;
7626 # at #
7627 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
7628 SET TIMESTAMP=1000000000/*!*/;
7629@@ -389,7 +389,7 @@ ALTER TABLE t1 DROP PRIMARY KEY, ADD KEY key_t1 (a)
7630 /*!*/;
7631 # at #
7632 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-13 trans
7633-/*!100001 SET @@session.gtid_seq_no=13*//*!*/;
7634+/*M!100001 SET @@session.gtid_seq_no=13*//*!*/;
7635 START TRANSACTION
7636 /*!*/;
7637 # at #
7638@@ -407,7 +407,7 @@ COMMIT
7639 /*!*/;
7640 # at #
7641 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-14 trans
7642-/*!100001 SET @@session.gtid_seq_no=14*//*!*/;
7643+/*M!100001 SET @@session.gtid_seq_no=14*//*!*/;
7644 START TRANSACTION
7645 /*!*/;
7646 # at #
7647@@ -425,7 +425,7 @@ COMMIT
7648 /*!*/;
7649 # at #
7650 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-15 trans
7651-/*!100001 SET @@session.gtid_seq_no=15*//*!*/;
7652+/*M!100001 SET @@session.gtid_seq_no=15*//*!*/;
7653 START TRANSACTION
7654 /*!*/;
7655 # at #
7656@@ -443,7 +443,7 @@ COMMIT
7657 /*!*/;
7658 # at #
7659 #010909 4:46:40 server id # end_log_pos # CRC32 XXX GTID 0-1-16 ddl
7660-/*!100001 SET @@session.gtid_seq_no=16*//*!*/;
7661+/*M!100001 SET @@session.gtid_seq_no=16*//*!*/;
7662 # at #
7663 #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid>
7664 SET TIMESTAMP=1000000000/*!*/;
7665diff --git a/sql/field.h b/sql/field.h
7666index a311f8f9..508e677e 100644
7667--- a/sql/field.h
7668+++ b/sql/field.h
7669@@ -4261,7 +4261,7 @@ class Field_varstring_compressed final :public Field_varstring {
7670 void sql_type(String &str) const override
7671 {
7672 Field_varstring::sql_type(str);
7673- str.append(STRING_WITH_LEN(" /*!100301 COMPRESSED*/"));
7674+ str.append(STRING_WITH_LEN(" /*M!100301 COMPRESSED*/"));
7675 }
7676 uint32 max_display_length() const override { return field_length - 1; }
7677 uint32 character_octet_length() const override { return field_length - 1; }
7678@@ -4697,7 +4697,7 @@ class Field_blob_compressed final :public Field_blob {
7679 void sql_type(String &str) const override
7680 {
7681 Field_blob::sql_type(str);
7682- str.append(STRING_WITH_LEN(" /*!100301 COMPRESSED*/"));
7683+ str.append(STRING_WITH_LEN(" /*M!100301 COMPRESSED*/"));
7684 }
7685
7686 /*
7687diff --git a/sql/log_event_client.cc b/sql/log_event_client.cc
7688index 89a5387d..cf40aae0 100644
7689--- a/sql/log_event_client.cc
7690+++ b/sql/log_event_client.cc
7691@@ -3871,7 +3871,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
7692 print_event_info->allow_parallel != !!(flags2 & FL_ALLOW_PARALLEL))
7693 {
7694 if (my_b_printf(&cache,
7695- "/*!100101 SET @@session.skip_parallel_replication=%u*/%s\n",
7696+ "/*M!100101 SET @@session.skip_parallel_replication=%u*/%s\n",
7697 !(flags2 & FL_ALLOW_PARALLEL),
7698 print_event_info->delimiter))
7699 goto err;
7700@@ -3883,7 +3883,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
7701 print_event_info->domain_id != domain_id)
7702 {
7703 if (my_b_printf(&cache,
7704- "/*!100001 SET @@session.gtid_domain_id=%u*/%s\n",
7705+ "/*M!100001 SET @@session.gtid_domain_id=%u*/%s\n",
7706 domain_id, print_event_info->delimiter))
7707 goto err;
7708 print_event_info->domain_id= domain_id;
7709@@ -3893,7 +3893,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
7710 if (!print_event_info->server_id_printed ||
7711 print_event_info->server_id != server_id)
7712 {
7713- if (my_b_printf(&cache, "/*!100001 SET @@session.server_id=%u*/%s\n",
7714+ if (my_b_printf(&cache, "/*M!100001 SET @@session.server_id=%u*/%s\n",
7715 server_id, print_event_info->delimiter))
7716 goto err;
7717 print_event_info->server_id= server_id;
7718@@ -3901,7 +3901,7 @@ Gtid_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info)
7719 }
7720
7721 if (!is_flashback)
7722- if (my_b_printf(&cache, "/*!100001 SET @@session.gtid_seq_no=%s*/%s\n",
7723+ if (my_b_printf(&cache, "/*M!100001 SET @@session.gtid_seq_no=%s*/%s\n",
7724 buf, print_event_info->delimiter))
7725 goto err;
7726 }
7727--
77282.40.0
7729
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0005.patch b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0005.patch
new file mode 100644
index 0000000000..91b84acb16
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/CVE-2024-21096-0005.patch
@@ -0,0 +1,1431 @@
1From d20518168aff435a4843eebb108e5b9df24c19fb Mon Sep 17 00:00:00 2001
2From: Sergei Golubchik <serg@mariadb.org>
3Date: Mon, 17 Jun 2024 15:54:30 +0200
4Subject: [PATCH] also protect the /*!999999 sandbox comment
5
6CVE: CVE-2024-21096
7Upstream-Status: Backport [https://github.com/MariaDB/server/commit/d20518168aff435a4843eebb108e5b9df24c19fb]
8
9Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
10---
11 client/mysqldump.c | 2 +-
12 mysql-test/main/ddl_i18n_koi8r.result | 10 +-
13 mysql-test/main/ddl_i18n_utf8.result | 12 +-
14 mysql-test/main/lock_view.result | 4 +-
15 mysql-test/main/mysql.result | 4 +-
16 mysql-test/main/mysqldump-compat-102.result | 2 +-
17 mysql-test/main/mysqldump-max.result | 4 +-
18 mysql-test/main/mysqldump-nl.result | 4 +-
19 mysql-test/main/mysqldump-no-binlog.result | 2 +-
20 mysql-test/main/mysqldump-system.result | 6 +-
21 mysql-test/main/mysqldump-timing.result | 4 +-
22 mysql-test/main/mysqldump-utf8mb4.result | 2 +-
23 mysql-test/main/mysqldump.result | 201 +++++++++---------
24 mysql-test/main/openssl_1.result | 6 +-
25 mysql-test/main/plugin_auth.result | 2 +-
26 mysql-test/main/rpl_mysqldump_slave.result | 18 +-
27 mysql-test/main/trigger_wl3253.result | 4 +-
28 .../suite/archive/archive_bitfield.result | 2 +-
29 .../oracle/r/sp-package-mysqldump.result | 2 +-
30 mysql-test/suite/federated/federatedx.result | 2 +-
31 mysql-test/suite/roles/definer.result | 2 +-
32 mysql-test/suite/s3/mysqldump.result | 4 +-
33 .../suite/sql_sequence/mysqldump.result | 10 +-
34 .../connect/mysql-test/connect/r/mysql.result | 2 +-
35 24 files changed, 157 insertions(+), 154 deletions(-)
36
37diff --git a/client/mysqldump.c b/client/mysqldump.c
38index 9502227a..767413b1 100644
39--- a/client/mysqldump.c
40+++ b/client/mysqldump.c
41@@ -764,7 +764,7 @@ static void write_header(FILE *sql_file, const char *db_name)
42 }
43 else
44 {
45- fprintf(sql_file, "/*!999999\\- enable the sandbox mode */ \n");
46+ fprintf(sql_file, "/*M!999999\\- enable the sandbox mode */ \n");
47 if (!opt_compact)
48 {
49 print_comment(sql_file, 0,
50diff --git a/mysql-test/main/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result
51index 39bc4d4a..3b31fba7 100644
52--- a/mysql-test/main/ddl_i18n_koi8r.result
53+++ b/mysql-test/main/ddl_i18n_koi8r.result
54@@ -719,7 +719,7 @@ ca cb
55 utf8mb3_general_ci utf8mb3_general_ci
56
57 ---> Dump of mysqltest1
58-/*!999999\- enable the sandbox mode */
59+/*M!999999\- enable the sandbox mode */
60
61 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
62
63@@ -796,7 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
64 ---> Dumping mysqltest1 to ddl_i18n_koi8r.sp.mysqltest1.sql
65
66 ---> Dump of mysqltest2
67-/*!999999\- enable the sandbox mode */
68+/*M!999999\- enable the sandbox mode */
69
70 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
71
72@@ -1725,7 +1725,7 @@ koi8r_general_ci utf8mb3_general_ci koi8r_general_ci koi8r_general_ci utf8mb3_ge
73 DELETE FROM mysqltest2.log|
74
75 ---> Dump of mysqltest1
76-/*!999999\- enable the sandbox mode */
77+/*M!999999\- enable the sandbox mode */
78
79 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
80
81@@ -1808,7 +1808,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
82 ---> Dumping mysqltest1 to ddl_i18n_koi8r.triggers.mysqltest1.sql
83
84 ---> Dump of mysqltest2
85-/*!999999\- enable the sandbox mode */
86+/*M!999999\- enable the sandbox mode */
87
88 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
89
90@@ -2495,7 +2495,7 @@ COLLATION( '
91 END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8mb3_unicode_ci
92
93 ---> Dump of mysqltest1
94-/*!999999\- enable the sandbox mode */
95+/*M!999999\- enable the sandbox mode */
96
97 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
98
99diff --git a/mysql-test/main/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result
100index 33ec6e6e..c2bc4980 100644
101--- a/mysql-test/main/ddl_i18n_utf8.result
102+++ b/mysql-test/main/ddl_i18n_utf8.result
103@@ -719,7 +719,7 @@ ca cb
104 utf8mb3_general_ci utf8mb3_general_ci
105
106 ---> Dump of mysqltest1
107-/*!999999\- enable the sandbox mode */
108+/*M!999999\- enable the sandbox mode */
109
110 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
111
112@@ -796,7 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
113 ---> Dumping mysqltest1 to ddl_i18n_utf8sp.mysqltest1.sql
114
115 ---> Dump of mysqltest2
116-/*!999999\- enable the sandbox mode */
117+/*M!999999\- enable the sandbox mode */
118
119 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
120
121@@ -1725,7 +1725,7 @@ utf8mb3_general_ci utf8mb3_general_ci koi8r_general_ci utf8mb3_general_ci utf8mb
122 DELETE FROM mysqltest2.log|
123
124 ---> Dump of mysqltest1
125-/*!999999\- enable the sandbox mode */
126+/*M!999999\- enable the sandbox mode */
127
128 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
129
130@@ -1808,7 +1808,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
131 ---> Dumping mysqltest1 to ddl_i18n_utf8triggers.mysqltest1.sql
132
133 ---> Dump of mysqltest2
134-/*!999999\- enable the sandbox mode */
135+/*M!999999\- enable the sandbox mode */
136
137 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
138
139@@ -2495,7 +2495,7 @@ COLLATION( 'текÑÑ‚') AS c4,
140 END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8mb3 utf8mb3_general_ci utf8mb3_unicode_ci
141
142 ---> Dump of mysqltest1
143-/*!999999\- enable the sandbox mode */
144+/*M!999999\- enable the sandbox mode */
145
146 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
147
148@@ -2563,7 +2563,7 @@ DELIMITER ;
149 ---> Dumping mysqltest1 to ddl_i18n_utf8events.mysqltest1.sql
150
151 ---> Dump of mysqltest2
152-/*!999999\- enable the sandbox mode */
153+/*M!999999\- enable the sandbox mode */
154
155 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
156
157diff --git a/mysql-test/main/lock_view.result b/mysql-test/main/lock_view.result
158index 04462ce7..8182205e 100644
159--- a/mysql-test/main/lock_view.result
160+++ b/mysql-test/main/lock_view.result
161@@ -16,7 +16,7 @@ create definer=definer@localhost view mysqltest3.v3is as select schema_name from
162 create definer=definer@localhost view mysqltest3.v3ps as select user from performance_schema.users where current_connections>0 order by user;
163 create definer=definer@localhost view mysqltest3.v3nt as select 1;
164 create definer=definer@localhost sql security invoker view mysqltest3.v3i as select * from mysqltest1.t1;
165-/*!999999\- enable the sandbox mode */
166+/*M!999999\- enable the sandbox mode */
167
168 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
169
170@@ -236,7 +236,7 @@ create view v1 as select * from (select * from t1) dt;
171 lock table v1 read;
172 disconnect con1;
173 connection default;
174-/*!999999\- enable the sandbox mode */
175+/*M!999999\- enable the sandbox mode */
176 SET @saved_cs_client = @@character_set_client;
177 SET character_set_client = utf8;
178 /*!50001 CREATE VIEW `v1` AS SELECT
179diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result
180index b983f009..cf0805ef 100644
181--- a/mysql-test/main/mysql.result
182+++ b/mysql-test/main/mysql.result
183@@ -552,7 +552,7 @@ Table Create Table
184 a1\`b1 CREATE TABLE `a1\``b1` (
185 `a` int(11) DEFAULT NULL
186 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
187-/*!999999\- enable the sandbox mode */
188+/*M!999999\- enable the sandbox mode */
189 /*!40101 SET @saved_cs_client = @@character_set_client */;
190 /*!40101 SET character_set_client = utf8 */;
191 CREATE TABLE `a1\``b1` (
192@@ -584,7 +584,7 @@ Table Create Table
193 a1\"b1 CREATE TABLE "a1\""b1" (
194 "a" int(11) DEFAULT NULL
195 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
196-/*!999999\- enable the sandbox mode */
197+/*M!999999\- enable the sandbox mode */
198 /*!40101 SET @saved_cs_client = @@character_set_client */;
199 /*!40101 SET character_set_client = utf8 */;
200 CREATE TABLE "a1\""b1" (
201diff --git a/mysql-test/main/mysqldump-compat-102.result b/mysql-test/main/mysqldump-compat-102.result
202index 35a06d20..656f506f 100644
203--- a/mysql-test/main/mysqldump-compat-102.result
204+++ b/mysql-test/main/mysqldump-compat-102.result
205@@ -58,7 +58,7 @@ BEGIN
206 log(0, 'Session ' || connection_id() || ' ' || current_user || ' started');
207 END;
208 $$
209-/*!999999\- enable the sandbox mode */
210+/*M!999999\- enable the sandbox mode */
211 -- MariaDB dump DUMPVERSION Distrib DISTVERSION, for OS
212 --
213 -- Host: localhost Database: db1_mdev17429
214diff --git a/mysql-test/main/mysqldump-max.result b/mysql-test/main/mysqldump-max.result
215index 86e8eb07..a006b805 100644
216--- a/mysql-test/main/mysqldump-max.result
217+++ b/mysql-test/main/mysqldump-max.result
218@@ -77,7 +77,7 @@ id name
219 3 first value
220 4 first value
221 5 first value
222-/*!999999\- enable the sandbox mode */
223+/*M!999999\- enable the sandbox mode */
224
225 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
226 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
227@@ -205,7 +205,7 @@ INSERT IGNORE INTO `t6` VALUES
228 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
229 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
230
231-/*!999999\- enable the sandbox mode */
232+/*M!999999\- enable the sandbox mode */
233
234 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
235 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
236diff --git a/mysql-test/main/mysqldump-nl.result b/mysql-test/main/mysqldump-nl.result
237index 1cbc23f9..20a68f6a 100644
238--- a/mysql-test/main/mysqldump-nl.result
239+++ b/mysql-test/main/mysqldump-nl.result
240@@ -12,7 +12,7 @@ create procedure sp() select * from `v1
241 1v`;
242 flush tables;
243 use test;
244-/*!999999\- enable the sandbox mode */
245+/*M!999999\- enable the sandbox mode */
246
247 --
248 -- Current Database: `mysqltest1
249@@ -135,7 +135,7 @@ test\`
250 \! ls
251 #
252 test`
253-/*!999999\- enable the sandbox mode */
254+/*M!999999\- enable the sandbox mode */
255
256 --
257 -- Current Database: `test```
258diff --git a/mysql-test/main/mysqldump-no-binlog.result b/mysql-test/main/mysqldump-no-binlog.result
259index b9dfb223..4ca25f7c 100644
260--- a/mysql-test/main/mysqldump-no-binlog.result
261+++ b/mysql-test/main/mysqldump-no-binlog.result
262@@ -1,2 +1,2 @@
263 mariadb-dump: Error: Binlogging on server not active
264-/*!999999\- enable the sandbox mode */
265+/*M!999999\- enable the sandbox mode */
266diff --git a/mysql-test/main/mysqldump-system.result b/mysql-test/main/mysqldump-system.result
267index 0b6fe995..5619ec70 100644
268--- a/mysql-test/main/mysqldump-system.result
269+++ b/mysql-test/main/mysqldump-system.result
270@@ -39,7 +39,7 @@ CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
271 #
272 # mysqldump of system tables with --system=all
273 #
274-/*!999999\- enable the sandbox mode */
275+/*M!999999\- enable the sandbox mode */
276
277 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
278 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
279@@ -631,7 +631,7 @@ UNLOCK TABLES;
280 #
281 # mysqldump of system tables with --system=all --replace
282 #
283-/*!999999\- enable the sandbox mode */
284+/*M!999999\- enable the sandbox mode */
285
286 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
287 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
288@@ -1246,7 +1246,7 @@ UNLOCK TABLES;
289 #
290 # mysqldump of system tables with --system=all --insert-ignore
291 #
292-/*!999999\- enable the sandbox mode */
293+/*M!999999\- enable the sandbox mode */
294
295 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
296 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
297diff --git a/mysql-test/main/mysqldump-timing.result b/mysql-test/main/mysqldump-timing.result
298index 8ae621e5..3f1840a7 100644
299--- a/mysql-test/main/mysqldump-timing.result
300+++ b/mysql-test/main/mysqldump-timing.result
301@@ -7,7 +7,7 @@ CREATE TABLE t1 (i INT);
302 INSERT INTO t1 VALUES (0);
303 LOCK TABLE t1 WRITE;
304 timeout without t1 contents expected
305-/*!999999\- enable the sandbox mode */
306+/*M!999999\- enable the sandbox mode */
307
308 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
309 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
310@@ -31,7 +31,7 @@ SET @save_max_statement_time=@@max_statement_time;
311 SET GLOBAL max_statement_time=0.1;
312 UNLOCK TABLES;;
313 This would be a race condition otherwise, but default max_statement_time=0 makes it succeed
314-/*!999999\- enable the sandbox mode */
315+/*M!999999\- enable the sandbox mode */
316
317 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
318 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
319diff --git a/mysql-test/main/mysqldump-utf8mb4.result b/mysql-test/main/mysqldump-utf8mb4.result
320index e38c8a47..5d07eb06 100644
321--- a/mysql-test/main/mysqldump-utf8mb4.result
322+++ b/mysql-test/main/mysqldump-utf8mb4.result
323@@ -32,7 +32,7 @@ Testing XML format output
324 ----
325 Testing text format output
326 ----
327-/*!999999\- enable the sandbox mode */
328+/*M!999999\- enable the sandbox mode */
329
330 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
331 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
332diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
333index 2f888ddd..ca9260f1 100644
334--- a/mysql-test/main/mysqldump.result
335+++ b/mysql-test/main/mysqldump.result
336@@ -31,7 +31,7 @@ DROP TABLE t1;
337 CREATE TABLE t1 (a decimal(64, 20));
338 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
339 ("0987654321098765432109876543210987654321");
340-/*!999999\- enable the sandbox mode */
341+/*M!999999\- enable the sandbox mode */
342 /*!40101 SET @saved_cs_client = @@character_set_client */;
343 /*!40101 SET character_set_client = utf8 */;
344 CREATE TABLE `t1` (
345@@ -49,7 +49,7 @@ CREATE TABLE t1 (a double);
346 INSERT IGNORE INTO t1 VALUES ('-9e999999');
347 Warnings:
348 Warning 1264 Out of range value for column 'a' at row 1
349-/*!999999\- enable the sandbox mode */
350+/*M!999999\- enable the sandbox mode */
351 /*!40101 SET @saved_cs_client = @@character_set_client */;
352 /*!40101 SET character_set_client = utf8 */;
353 CREATE TABLE `t1` (
354@@ -72,7 +72,7 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456);
355 INSERT INTO t1 VALUES ("1.2345", 2.3456);
356 ERROR 42S22: Unknown column '1.2345' in 'field list'
357 SET SQL_MODE=@OLD_SQL_MODE;
358-/*!999999\- enable the sandbox mode */
359+/*M!999999\- enable the sandbox mode */
360 /*!40101 SET @saved_cs_client = @@character_set_client */;
361 /*!40101 SET character_set_client = utf8 */;
362 CREATE TABLE `t1` (
363@@ -86,7 +86,7 @@ INSERT INTO `t1` VALUES
364 (1.23450,2.3456),
365 (1.23450,2.3456),
366 (1.23450,2.3456);
367-/*!999999\- enable the sandbox mode */
368+/*M!999999\- enable the sandbox mode */
369 /*!40101 SET @saved_cs_client = @@character_set_client */;
370 /*!40101 SET character_set_client = utf8 */;
371 CREATE TABLE `t1` (
372@@ -100,7 +100,7 @@ INSERT INTO `t1` VALUES
373 (1.23450,2.3456),
374 (1.23450,2.3456),
375 (1.23450,2.3456);
376-/*!999999\- enable the sandbox mode */
377+/*M!999999\- enable the sandbox mode */
378
379 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
380 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
381@@ -141,7 +141,7 @@ UNLOCK TABLES;
382 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
383 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
384
385-/*!999999\- enable the sandbox mode */
386+/*M!999999\- enable the sandbox mode */
387 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
388 /*!40103 SET TIME_ZONE='+00:00' */;
389 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
390@@ -223,7 +223,7 @@ DROP TABLE t1;
391 #
392 CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r;
393 INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
394-/*!999999\- enable the sandbox mode */
395+/*M!999999\- enable the sandbox mode */
396
397 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
398 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
399@@ -265,7 +265,7 @@ DROP TABLE t1;
400 #
401 CREATE TABLE t1 (a int) ENGINE=MYISAM;
402 INSERT INTO t1 VALUES (1), (2);
403-/*!999999\- enable the sandbox mode */
404+/*M!999999\- enable the sandbox mode */
405 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
406 /*!40103 SET TIME_ZONE='+00:00' */;
407 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
408@@ -291,7 +291,7 @@ UNLOCK TABLES;
409 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
410 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
411
412-/*!999999\- enable the sandbox mode */
413+/*M!999999\- enable the sandbox mode */
414 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
415 /*!40103 SET TIME_ZONE='+00:00' */;
416 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
417@@ -322,7 +322,7 @@ DROP TABLE t1;
418 # Bug#2592 mysqldump doesn't quote "tricky" names correctly
419 #
420 create table ```a` (i int);
421-/*!999999\- enable the sandbox mode */
422+/*M!999999\- enable the sandbox mode */
423 /*!40101 SET @saved_cs_client = @@character_set_client */;
424 /*!40101 SET character_set_client = utf8 */;
425 CREATE TABLE ```a` (
426@@ -334,7 +334,7 @@ drop table ```a`;
427 # Bug#2591 mysqldump quotes names inconsistently
428 #
429 create table t1(a int);
430-/*!999999\- enable the sandbox mode */
431+/*M!999999\- enable the sandbox mode */
432
433 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
434 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
435@@ -368,7 +368,7 @@ UNLOCK TABLES;
436 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
437 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
438
439-/*!999999\- enable the sandbox mode */
440+/*M!999999\- enable the sandbox mode */
441 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
442 /*!40103 SET TIME_ZONE='+00:00' */;
443 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
444@@ -395,7 +395,7 @@ UNLOCK TABLES;
445 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
446
447 set global sql_mode='ANSI_QUOTES';
448-/*!999999\- enable the sandbox mode */
449+/*M!999999\- enable the sandbox mode */
450
451 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
452 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
453@@ -429,7 +429,7 @@ UNLOCK TABLES;
454 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
455 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
456
457-/*!999999\- enable the sandbox mode */
458+/*M!999999\- enable the sandbox mode */
459 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
460 /*!40103 SET TIME_ZONE='+00:00' */;
461 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
462@@ -462,7 +462,7 @@ drop table t1;
463 #
464 create table t1(a int);
465 insert into t1 values (1),(2),(3);
466-/*!999999\- enable the sandbox mode */
467+/*M!999999\- enable the sandbox mode */
468
469 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
470 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
471@@ -495,7 +495,7 @@ drop table t1;
472 #
473 # Bug#6101 create database problem
474 #
475-/*!999999\- enable the sandbox mode */
476+/*M!999999\- enable the sandbox mode */
477
478 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
479 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
480@@ -522,7 +522,7 @@ USE `test`;
481 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
482
483 create database mysqldump_test_db character set latin2 collate latin2_bin;
484-/*!999999\- enable the sandbox mode */
485+/*M!999999\- enable the sandbox mode */
486
487 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
488 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
489@@ -557,7 +557,7 @@ drop database mysqldump_test_db;
490 # if it is explicitly set.
491 CREATE TABLE t1 (a CHAR(10));
492 INSERT INTO t1 VALUES (_latin1 'ÄÖÜß');
493-/*!999999\- enable the sandbox mode */
494+/*M!999999\- enable the sandbox mode */
495
496 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
497 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
498@@ -600,7 +600,7 @@ UNLOCK TABLES;
499 # If the future we can move this command into a separate test with
500 # checking that "mysqldump" is compiled with "latin1"
501 #
502-/*!999999\- enable the sandbox mode */
503+/*M!999999\- enable the sandbox mode */
504 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
505 /*!40103 SET TIME_ZONE='+00:00' */;
506 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
507@@ -625,7 +625,7 @@ UNLOCK TABLES;
508 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
509 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
510
511-/*!999999\- enable the sandbox mode */
512+/*M!999999\- enable the sandbox mode */
513 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
514 /*!40103 SET TIME_ZONE='+00:00' */;
515 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
516@@ -650,7 +650,7 @@ UNLOCK TABLES;
517 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
518 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
519
520-/*!999999\- enable the sandbox mode */
521+/*M!999999\- enable the sandbox mode */
522 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
523 /*!40103 SET TIME_ZONE='+00:00' */;
524 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
525@@ -683,7 +683,7 @@ CREATE TABLE t1 (a int);
526 CREATE TABLE t2 (a int);
527 INSERT INTO t1 VALUES (1),(2),(3);
528 INSERT INTO t2 VALUES (4),(5),(6);
529-/*!999999\- enable the sandbox mode */
530+/*M!999999\- enable the sandbox mode */
531
532 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
533 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
534@@ -728,7 +728,7 @@ DROP TABLE t2;
535 #
536 CREATE TABLE t1 (`b` blob);
537 INSERT INTO `t1` VALUES (0x602010000280100005E71A);
538-/*!999999\- enable the sandbox mode */
539+/*M!999999\- enable the sandbox mode */
540
541 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
542 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
543@@ -770,7 +770,7 @@ DROP TABLE t1;
544 CREATE TABLE t1 (a INT) ENGINE=MyISAM;
545 INSERT INTO t1 VALUES (1),(2),(3);
546 INSERT INTO t1 VALUES (4),(5),(6);
547-/*!999999\- enable the sandbox mode */
548+/*M!999999\- enable the sandbox mode */
549
550 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
551 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
552@@ -811,7 +811,7 @@ UNLOCK TABLES;
553 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
554 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
555
556-/*!999999\- enable the sandbox mode */
557+/*M!999999\- enable the sandbox mode */
558
559 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
560 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
561@@ -1187,7 +1187,7 @@ F_cd00692c3bfe59267d5ecfac5310286c int,
562 F_6faa8040da20ef399b63a72d0e4ab575 int,
563 F_fe73f687e5bc5280214e0486b273a5f9 int);
564 insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
565-/*!999999\- enable the sandbox mode */
566+/*M!999999\- enable the sandbox mode */
567
568 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
569 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
570@@ -1557,7 +1557,7 @@ drop table t1;
571 #
572 CREATE TABLE t1 (a int);
573 INSERT INTO t1 VALUES (1),(2),(3);
574-/*!999999\- enable the sandbox mode */
575+/*M!999999\- enable the sandbox mode */
576
577 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
578 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
579@@ -1611,7 +1611,7 @@ CREATE TABLE t1 ( a INT );
580 CREATE TABLE t2 ( a INT );
581 INSERT INTO t1 VALUES (1), (2);
582 INSERT INTO t2 VALUES (1), (2);
583-/*!999999\- enable the sandbox mode */
584+/*M!999999\- enable the sandbox mode */
585
586 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
587 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
588@@ -1647,7 +1647,7 @@ CREATE TABLE `t2` (
589 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
590 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
591
592-/*!999999\- enable the sandbox mode */
593+/*M!999999\- enable the sandbox mode */
594
595 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
596 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
597@@ -1720,35 +1720,35 @@ create table t3(a varchar(30) primary key, b int not null);
598 test_sequence
599 ------ Testing with illegal table names ------
600 mariadb-dump: Couldn't find table: "\d-2-1.sql"
601-/*!999999\- enable the sandbox mode */
602+/*M!999999\- enable the sandbox mode */
603 mariadb-dump: Couldn't find table: "\t1"
604-/*!999999\- enable the sandbox mode */
605+/*M!999999\- enable the sandbox mode */
606 mariadb-dump: Couldn't find table: "\t1"
607-/*!999999\- enable the sandbox mode */
608+/*M!999999\- enable the sandbox mode */
609 mariadb-dump: Couldn't find table: "\\t1"
610-/*!999999\- enable the sandbox mode */
611+/*M!999999\- enable the sandbox mode */
612 mariadb-dump: Couldn't find table: "t\1"
613-/*!999999\- enable the sandbox mode */
614+/*M!999999\- enable the sandbox mode */
615 mariadb-dump: Couldn't find table: "t\1"
616-/*!999999\- enable the sandbox mode */
617+/*M!999999\- enable the sandbox mode */
618 mariadb-dump: Couldn't find table: "t/1"
619-/*!999999\- enable the sandbox mode */
620+/*M!999999\- enable the sandbox mode */
621 mariadb-dump: Couldn't find table: "T_1"
622-/*!999999\- enable the sandbox mode */
623+/*M!999999\- enable the sandbox mode */
624 mariadb-dump: Couldn't find table: "T%1"
625-/*!999999\- enable the sandbox mode */
626+/*M!999999\- enable the sandbox mode */
627 mariadb-dump: Couldn't find table: "T'1"
628-/*!999999\- enable the sandbox mode */
629+/*M!999999\- enable the sandbox mode */
630 mariadb-dump: Couldn't find table: "T_1"
631-/*!999999\- enable the sandbox mode */
632+/*M!999999\- enable the sandbox mode */
633 mariadb-dump: Couldn't find table: "T_"
634-/*!999999\- enable the sandbox mode */
635+/*M!999999\- enable the sandbox mode */
636 test_sequence
637 ------ Testing with illegal database names ------
638 mariadb-dump: Got error: 1049: "Unknown database 'mysqldump_test_d'" when selecting the database
639-/*!999999\- enable the sandbox mode */
640+/*M!999999\- enable the sandbox mode */
641 mariadb-dump: Got error: 1049: "Unknown database 'mysqld\ump_test_db'" when selecting the database
642-/*!999999\- enable the sandbox mode */
643+/*M!999999\- enable the sandbox mode */
644 drop table t1, t2, t3;
645 drop database mysqldump_test_db;
646 use test;
647@@ -1810,7 +1810,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
648 </table_data>
649 </database>
650 </mysqldump>
651-/*!999999\- enable the sandbox mode */
652+/*M!999999\- enable the sandbox mode */
653
654 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
655 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
656@@ -1849,7 +1849,7 @@ UNLOCK TABLES;
657 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
658 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
659
660-/*!999999\- enable the sandbox mode */
661+/*M!999999\- enable the sandbox mode */
662
663 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
664 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
665@@ -1975,7 +1975,7 @@ create table t1(a int);
666 create table t2(a int);
667 create table t3(a int);
668 mariadb-dump: Couldn't find table: "non_existing"
669-/*!999999\- enable the sandbox mode */
670+/*M!999999\- enable the sandbox mode */
671
672 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
673 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
674@@ -2025,7 +2025,7 @@ drop table t1, t2, t3;
675 create table t1 (a int);
676 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)
677 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
678-/*!999999\- enable the sandbox mode */
679+/*M!999999\- enable the sandbox mode */
680
681 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
682 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
683@@ -2067,7 +2067,7 @@ CREATE TABLE `t1` (
684 PRIMARY KEY (`a b`, `c"d`, `e``f`)
685 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
686 insert into t1 values (0815, 4711, 2006);
687-/*!999999\- enable the sandbox mode */
688+/*M!999999\- enable the sandbox mode */
689 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
690 /*!40103 SET TIME_ZONE='+00:00' */;
691 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
692@@ -2098,7 +2098,7 @@ UNLOCK TABLES;
693 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
694 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
695
696-/*!999999\- enable the sandbox mode */
697+/*M!999999\- enable the sandbox mode */
698
699 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
700 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
701@@ -2154,7 +2154,7 @@ INSERT INTO t2 VALUES ('bingo');
702 INSERT INTO t2 VALUES ('waffle');
703 INSERT INTO t2 VALUES ('lemon');
704 create view v2 as select * from t2 where a like 'a%' with check option;
705-/*!999999\- enable the sandbox mode */
706+/*M!999999\- enable the sandbox mode */
707
708 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
709 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
710@@ -2254,7 +2254,7 @@ drop database db1;
711 use test;
712 create table t1(a int);
713 create view v1 as select * from t1;
714-/*!999999\- enable the sandbox mode */
715+/*M!999999\- enable the sandbox mode */
716
717 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
718 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
719@@ -2325,7 +2325,7 @@ INSERT INTO t2 VALUES ('bingo');
720 INSERT INTO t2 VALUES ('waffle');
721 INSERT INTO t2 VALUES ('lemon');
722 create view v2 as select * from t2 where a like 'a%' with check option;
723-/*!999999\- enable the sandbox mode */
724+/*M!999999\- enable the sandbox mode */
725
726 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
727 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
728@@ -2396,7 +2396,7 @@ use test;
729 #
730 CREATE TABLE t1 (a char(10));
731 INSERT INTO t1 VALUES ('\'');
732-/*!999999\- enable the sandbox mode */
733+/*M!999999\- enable the sandbox mode */
734
735 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
736 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
737@@ -2444,7 +2444,7 @@ create view v1 as
738 select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);
739 create view v2 as
740 select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
741-/*!999999\- enable the sandbox mode */
742+/*M!999999\- enable the sandbox mode */
743
744 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
745 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
746@@ -2597,7 +2597,7 @@ end if;
747 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
748 INSERT INTO t1 (a) VALUES (1),(2),(3),(22);
749 update t1 set a = 4 where a=3;
750-/*!999999\- enable the sandbox mode */
751+/*M!999999\- enable the sandbox mode */
752
753 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
754 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
755@@ -2731,7 +2731,7 @@ DELIMITER ;
756 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
757 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
758
759-/*!999999\- enable the sandbox mode */
760+/*M!999999\- enable the sandbox mode */
761
762 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
763 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
764@@ -2883,7 +2883,7 @@ Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be
765 set sql_mode='ansi';
766 create procedure `a'b` () select 1;
767 set sql_mode='';
768-/*!999999\- enable the sandbox mode */
769+/*M!999999\- enable the sandbox mode */
770
771 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
772 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
773@@ -3040,7 +3040,7 @@ d
774 2003-10-26 02:00:00
775 2003-10-26 02:00:00
776 set global time_zone='Europe/Moscow';
777-/*!999999\- enable the sandbox mode */
778+/*M!999999\- enable the sandbox mode */
779
780 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
781 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
782@@ -3082,7 +3082,7 @@ UNLOCK TABLES;
783 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
784 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
785
786-/*!999999\- enable the sandbox mode */
787+/*M!999999\- enable the sandbox mode */
788
789 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
790 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
791@@ -3145,7 +3145,7 @@ a2
792 1
793 2
794 3
795-/*!999999\- enable the sandbox mode */
796+/*M!999999\- enable the sandbox mode */
797 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
798 /*!40103 SET TIME_ZONE='+00:00' */;
799 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
800@@ -3226,7 +3226,7 @@ a b c
801 1 first value xxxx
802 2 second value tttt
803 3 third value vvv vvv
804-/*!999999\- enable the sandbox mode */
805+/*M!999999\- enable the sandbox mode */
806
807 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
808 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
809@@ -3355,7 +3355,7 @@ BEGIN
810 SET new.a = 0;
811 END|
812 SET SQL_MODE = @old_sql_mode;
813-/*!999999\- enable the sandbox mode */
814+/*M!999999\- enable the sandbox mode */
815
816 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
817 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
818@@ -3419,7 +3419,7 @@ DROP TABLE t1;
819 #
820 create table t1 (a binary(1), b blob);
821 insert into t1 values ('','');
822-/*!999999\- enable the sandbox mode */
823+/*M!999999\- enable the sandbox mode */
824
825 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
826 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
827@@ -3455,7 +3455,7 @@ UNLOCK TABLES;
828 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
829 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
830
831-/*!999999\- enable the sandbox mode */
832+/*M!999999\- enable the sandbox mode */
833
834 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
835 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
836@@ -3556,7 +3556,7 @@ insert into t values(5, 51);
837 create view v1 as select qty, price, qty*price as value from t;
838 create view v2 as select qty from v1;
839 mysqldump {
840-/*!999999\- enable the sandbox mode */
841+/*M!999999\- enable the sandbox mode */
842 /*!50001 DROP VIEW IF EXISTS `v1`*/;
843 /*!50001 SET @saved_cs_client = @@character_set_client */;
844 /*!50001 SET @saved_cs_results = @@character_set_results */;
845@@ -3572,7 +3572,7 @@ mysqldump {
846 /*!50001 SET collation_connection = @saved_col_connection */;
847
848 } mysqldump {
849-/*!999999\- enable the sandbox mode */
850+/*M!999999\- enable the sandbox mode */
851 /*!50001 DROP VIEW IF EXISTS `v2`*/;
852 /*!50001 SET @saved_cs_client = @@character_set_client */;
853 /*!50001 SET @saved_cs_results = @@character_set_results */;
854@@ -3618,7 +3618,7 @@ drop table t1;
855 mysqldump {
856 mariadb-dump: Got error: 1356: "View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them" when using LOCK TABLES
857 mariadb-dump: Couldn't execute 'SHOW FIELDS FROM `v1`': View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them (1356)
858-/*!999999\- enable the sandbox mode */
859+/*M!999999\- enable the sandbox mode */
860
861 -- failed on view `v1`: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`t1`.`id` AS `id` from `t1`
862
863@@ -3635,7 +3635,7 @@ insert into t1 values (1232131);
864 insert into t1 values (4711);
865 insert into t1 values (3231);
866 insert into t1 values (0815);
867-/*!999999\- enable the sandbox mode */
868+/*M!999999\- enable the sandbox mode */
869
870 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
871 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
872@@ -3714,7 +3714,7 @@ create table basetable ( id serial, tag varchar(64) );
873 create database mysqldump_views;
874 use mysqldump_views;
875 create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_tables.basetable;
876-/*!999999\- enable the sandbox mode */
877+/*M!999999\- enable the sandbox mode */
878
879 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
880
881@@ -3799,14 +3799,14 @@ create user mysqltest_1@localhost;
882 create table t1(a int, b varchar(34));
883 reset master;
884 mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
885-/*!999999\- enable the sandbox mode */
886+/*M!999999\- enable the sandbox mode */
887 mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
888-/*!999999\- enable the sandbox mode */
889+/*M!999999\- enable the sandbox mode */
890 grant RELOAD on *.* to mysqltest_1@localhost;
891 mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
892-/*!999999\- enable the sandbox mode */
893+/*M!999999\- enable the sandbox mode */
894 mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
895-/*!999999\- enable the sandbox mode */
896+/*M!999999\- enable the sandbox mode */
897 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
898 drop table t1;
899 drop user mysqltest_1@localhost;
900@@ -3865,7 +3865,7 @@ use test;
901 #
902 # Bug #33762: mysqldump can not dump INFORMATION_SCHEMA
903 #
904-/*!999999\- enable the sandbox mode */
905+/*M!999999\- enable the sandbox mode */
906 DROP TABLE IF EXISTS `TABLES`;
907 /*!40101 SET @saved_cs_client = @@character_set_client */;
908 /*!40101 SET character_set_client = utf8 */;
909@@ -3930,7 +3930,7 @@ DROP TABLE t1;
910 CREATE TABLE t2 (a INT) ENGINE=MyISAM;
911 CREATE TABLE t3 (a INT) ENGINE=MyISAM;
912 CREATE TABLE t1 (a INT) ENGINE=merge UNION=(t2, t3);
913-/*!999999\- enable the sandbox mode */
914+/*M!999999\- enable the sandbox mode */
915
916 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
917 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
918@@ -4021,12 +4021,12 @@ connect user27293,localhost,user1,,mysqldump_test_db,$MASTER_MYPORT,$MASTER_MYS
919 connection user27293;
920 create procedure mysqldump_test_db.sp1() select 'hello';
921 mariadb-dump: user2 has insufficient privileges to SHOW CREATE PROCEDURE `sp1`!
922-/*!999999\- enable the sandbox mode */
923+/*M!999999\- enable the sandbox mode */
924
925 -- insufficient privileges to SHOW CREATE PROCEDURE `sp1`
926 -- does user2 have permissions on mysql.proc?
927
928-/*!999999\- enable the sandbox mode */
929+/*M!999999\- enable the sandbox mode */
930 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
931 /*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
932 /*!50003 SET @saved_cs_client = @@character_set_client */ ;
933@@ -4054,7 +4054,7 @@ drop database mysqldump_test_db;
934 #
935 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
936 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
937-/*!999999\- enable the sandbox mode */
938+/*M!999999\- enable the sandbox mode */
939 /*!40101 SET @saved_cs_client = @@character_set_client */;
940 /*!40101 SET character_set_client = utf8 */;
941 CREATE TABLE `t1` (
942@@ -4102,18 +4102,21 @@ DROP TABLE t1,t2;
943 # "Dump completed on"
944 #
945 # --skip-dump-date:
946+/*M!999999\- enable the sandbox mode */
947 --
948
949
950
951 -- Dump completed
952 # --dump-date:
953+/*M!999999\- enable the sandbox mode */
954 --
955
956
957
958 -- Dump completed on DATE
959 # --dump-date (default):
960+/*M!999999\- enable the sandbox mode */
961 --
962
963
964@@ -4128,7 +4131,7 @@ use db42635;
965 create table t1 (id int);
966 create view db42635.v1 (c) as select * from db42635.t1;
967 create view db42635.v2 (c) as select * from db42635.t1;
968-/*!999999\- enable the sandbox mode */
969+/*M!999999\- enable the sandbox mode */
970
971 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
972 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
973@@ -4189,7 +4192,7 @@ drop database db42635;
974 #
975 SET NAMES utf8;
976 CREATE TABLE `straße` ( f1 INT );
977-/*!999999\- enable the sandbox mode */
978+/*M!999999\- enable the sandbox mode */
979 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
980 /*!40103 SET TIME_ZONE='+00:00' */;
981 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
982@@ -4212,7 +4215,7 @@ UNLOCK TABLES;
983 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
984 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
985
986-/*!999999\- enable the sandbox mode */
987+/*M!999999\- enable the sandbox mode */
988 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
989 /*!40103 SET TIME_ZONE='+00:00' */;
990 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
991@@ -4237,7 +4240,7 @@ UNLOCK TABLES;
992
993 DROP TABLE `straße`;
994 CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
995-/*!999999\- enable the sandbox mode */
996+/*M!999999\- enable the sandbox mode */
997 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
998 /*!40103 SET TIME_ZONE='+00:00' */;
999 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
1000@@ -4261,7 +4264,7 @@ UNLOCK TABLES;
1001 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
1002
1003 mariadb-dump: Got error: 1146: "Table 'test.???????????????????????' doesn't exist" when using LOCK TABLES
1004-/*!999999\- enable the sandbox mode */
1005+/*M!999999\- enable the sandbox mode */
1006 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
1007 /*!40103 SET TIME_ZONE='+00:00' */;
1008 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
1009@@ -4278,7 +4281,7 @@ CREATE TABLE t1(a int, b int);
1010 INSERT INTO t1 VALUES (1,1);
1011 INSERT INTO t1 VALUES (2,3);
1012 INSERT INTO t1 VALUES (3,4), (4,5);
1013-/*!999999\- enable the sandbox mode */
1014+/*M!999999\- enable the sandbox mode */
1015
1016 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1017 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1018@@ -4553,7 +4556,7 @@ insert into t1 values (1232131);
1019 insert into t1 values (4711);
1020 insert into t1 values (3231);
1021 insert into t1 values (0815);
1022-/*!999999\- enable the sandbox mode */
1023+/*M!999999\- enable the sandbox mode */
1024
1025 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1026 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1027@@ -4686,7 +4689,7 @@ CREATE DATABASE test;
1028 create database `test-database`;
1029 use `test-database`;
1030 create table test (a int);
1031-/*!999999\- enable the sandbox mode */
1032+/*M!999999\- enable the sandbox mode */
1033 DROP TABLE IF EXISTS `test`;
1034 /*!40101 SET @saved_cs_client = @@character_set_client */;
1035 /*!40101 SET character_set_client = utf8 */;
1036@@ -4909,7 +4912,7 @@ CREATE TRIGGER `trig` BEFORE INSERT ON `test` FOR EACH ROW BEGIN
1037 END |
1038 ALTER DATABASE `test-database` CHARACTER SET latin1 COLLATE latin1_swedish_ci;
1039 ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
1040-/*!999999\- enable the sandbox mode */
1041+/*M!999999\- enable the sandbox mode */
1042 /*!40101 SET @saved_cs_client = @@character_set_client */;
1043 /*!40101 SET character_set_client = utf8 */;
1044 CREATE TABLE `test` (
1045@@ -5393,7 +5396,7 @@ USE test;
1046 # Also verify that a prefix of the mode's name is enough.
1047 #
1048 CREATE TABLE t1 (a INT);
1049-/*!999999\- enable the sandbox mode */
1050+/*M!999999\- enable the sandbox mode */
1051 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
1052 /*!40103 SET TIME_ZONE='+00:00' */;
1053 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
1054@@ -5626,7 +5629,7 @@ CREATE DATABASE `a\"'``b`;
1055 USE `a\"'``b`;
1056 CREATE PROCEDURE p1() BEGIN END;
1057 ALTER DATABASE `a\"'``b` COLLATE utf8_general_ci;
1058-/*!999999\- enable the sandbox mode */
1059+/*M!999999\- enable the sandbox mode */
1060 /*!50003 SET @saved_sql_mode = @@sql_mode */ ;
1061 /*!50003 SET sql_mode = '' */ ;
1062 ALTER DATABASE `a\"'``b` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
1063@@ -5675,7 +5678,7 @@ CREATE VIEW nonunique_table_view_name AS SELECT 1;
1064
1065 ##################################################
1066 # --compact --databases db1 db2
1067-/*!999999\- enable the sandbox mode */
1068+/*M!999999\- enable the sandbox mode */
1069
1070 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
1071
1072@@ -5744,7 +5747,7 @@ USE `db2`;
1073 ##################################################
1074 # --compact db2
1075
1076-/*!999999\- enable the sandbox mode */
1077+/*M!999999\- enable the sandbox mode */
1078 /*!40101 SET @saved_cs_client = @@character_set_client */;
1079 /*!40101 SET character_set_client = utf8 */;
1080 CREATE TABLE `nonunique_table_name` (
1081@@ -5767,7 +5770,7 @@ INSERT INTO `nonunique_table_view_name` VALUES
1082
1083 ##################################################
1084 # --compact --delayed-insert --no-data-med=0 --databases db2 db1
1085-/*!999999\- enable the sandbox mode */
1086+/*M!999999\- enable the sandbox mode */
1087
1088 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
1089
1090@@ -5899,7 +5902,7 @@ CREATE TABLE t1 (a int, b int);
1091 CREATE TRIGGER tt1_t1 BEFORE INSERT ON t1 FOR EACH ROW
1092 SET NEW.b=NEW.a + 10;
1093 INSERT INTO t1 (a) VALUES (1),(2),(3);
1094-/*!999999\- enable the sandbox mode */
1095+/*M!999999\- enable the sandbox mode */
1096
1097 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1098 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1099@@ -5948,7 +5951,7 @@ DROP TABLE t1;
1100 #
1101 # Without --replace and --insert-ignore
1102 #
1103-/*!999999\- enable the sandbox mode */
1104+/*M!999999\- enable the sandbox mode */
1105
1106 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1107 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1108@@ -6044,7 +6047,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
1109 #
1110 # With --replace
1111 #
1112-/*!999999\- enable the sandbox mode */
1113+/*M!999999\- enable the sandbox mode */
1114
1115 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1116 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1117@@ -6150,7 +6153,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
1118 #
1119 # With --insert-ignore
1120 #
1121-/*!999999\- enable the sandbox mode */
1122+/*M!999999\- enable the sandbox mode */
1123
1124 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1125 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1126@@ -6275,7 +6278,7 @@ insert into t3 values(2);
1127 insert into t3(`invisible`, `a b c & $!@#$%^&*( )`, `ds=~!@ \# $% ^ & * ( ) _ - = +` ) values(1,2,3);
1128 CREATE TABLE t4(ËÃÃŒÃÎËÃ1 INT);
1129 insert into t4 values(1);
1130-/*!999999\- enable the sandbox mode */
1131+/*M!999999\- enable the sandbox mode */
1132 /*!40101 SET @saved_cs_client = @@character_set_client */;
1133 /*!40101 SET character_set_client = utf8 */;
1134 CREATE TABLE `t1` (
1135@@ -6316,7 +6319,7 @@ CREATE TABLE `t4` (
1136 INSERT INTO `t4` VALUES
1137 (1);
1138 #Check side effect on --complete insert
1139-/*!999999\- enable the sandbox mode */
1140+/*M!999999\- enable the sandbox mode */
1141 /*!40101 SET @saved_cs_client = @@character_set_client */;
1142 /*!40101 SET character_set_client = utf8 */;
1143 CREATE TABLE `t1` (
1144@@ -6686,7 +6689,7 @@ DROP DATABASE test1;
1145 # MDEV-33727 mariadb-dump trusts the server and does not validate the data
1146 #
1147 create table t1 (a int);
1148-/*!999999\- enable the sandbox mode */
1149+/*M!999999\- enable the sandbox mode */
1150 DROP TABLE IF EXISTS `t1`;
1151 /*!40101 SET @saved_cs_client = @@character_set_client */;
1152 /*!40101 SET character_set_client = utf8 */;
1153diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result
1154index 18294d16..48f2a082 100644
1155--- a/mysql-test/main/openssl_1.result
1156+++ b/mysql-test/main/openssl_1.result
1157@@ -77,7 +77,7 @@ DROP TABLE thread_status;
1158 SET GLOBAL event_scheduler=0;
1159 CREATE TABLE t1(a int);
1160 INSERT INTO t1 VALUES (1), (2);
1161-/*!999999\- enable the sandbox mode */
1162+/*M!999999\- enable the sandbox mode */
1163
1164 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1165 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1166@@ -114,7 +114,7 @@ UNLOCK TABLES;
1167 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
1168 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
1169
1170-/*!999999\- enable the sandbox mode */
1171+/*M!999999\- enable the sandbox mode */
1172
1173 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1174 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1175@@ -151,7 +151,7 @@ UNLOCK TABLES;
1176 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
1177 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
1178
1179-/*!999999\- enable the sandbox mode */
1180+/*M!999999\- enable the sandbox mode */
1181
1182 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1183 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1184diff --git a/mysql-test/main/plugin_auth.result b/mysql-test/main/plugin_auth.result
1185index f8128355..44e49018 100644
1186--- a/mysql-test/main/plugin_auth.result
1187+++ b/mysql-test/main/plugin_auth.result
1188@@ -338,7 +338,7 @@ FLUSH PRIVILEGES;
1189 # Executing 'mysqladmin'
1190 mysqld is alive
1191 # Executing 'mysqldump'
1192-/*!999999\- enable the sandbox mode */
1193+/*M!999999\- enable the sandbox mode */
1194 # Executing 'mysql_upgrade'
1195 #
1196 # Bug #59657: Move the client authentication_pam plugin into the
1197diff --git a/mysql-test/main/rpl_mysqldump_slave.result b/mysql-test/main/rpl_mysqldump_slave.result
1198index 6c28862b..edf811b0 100644
1199--- a/mysql-test/main/rpl_mysqldump_slave.result
1200+++ b/mysql-test/main/rpl_mysqldump_slave.result
1201@@ -7,15 +7,15 @@ connection slave;
1202 connection master;
1203 use test;
1204 connection slave;
1205-/*!999999\- enable the sandbox mode */
1206+/*M!999999\- enable the sandbox mode */
1207 -- SET GLOBAL gtid_slave_pos='';
1208 CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1209-/*!999999\- enable the sandbox mode */
1210+/*M!999999\- enable the sandbox mode */
1211 STOP ALL SLAVES;
1212 -- SET GLOBAL gtid_slave_pos='';
1213 CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1214 START ALL SLAVES;
1215-/*!999999\- enable the sandbox mode */
1216+/*M!999999\- enable the sandbox mode */
1217 STOP ALL SLAVES;
1218 -- SET GLOBAL gtid_slave_pos='';
1219 CHANGE MASTER '' TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1220@@ -23,7 +23,7 @@ START ALL SLAVES;
1221 start slave;
1222 Warnings:
1223 Note 1254 Slave is already running
1224-/*!999999\- enable the sandbox mode */
1225+/*M!999999\- enable the sandbox mode */
1226 -- SET GLOBAL gtid_slave_pos='';
1227 CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1228 start slave;
1229@@ -41,14 +41,14 @@ DROP TABLE t2;
1230
1231 1. --dump-slave=1
1232
1233-/*!999999\- enable the sandbox mode */
1234+/*M!999999\- enable the sandbox mode */
1235 SET GLOBAL gtid_slave_pos='0-1-1001';
1236 CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
1237 -- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1238
1239 2. --dump-slave=2
1240
1241-/*!999999\- enable the sandbox mode */
1242+/*M!999999\- enable the sandbox mode */
1243 -- SET GLOBAL gtid_slave_pos='0-1-1001';
1244 -- CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
1245 -- CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
1246@@ -56,21 +56,21 @@ CHANGE MASTER '' TO MASTER_USE_GTID=slave_pos;
1247
1248 1. --master-data=1
1249
1250-/*!999999\- enable the sandbox mode */
1251+/*M!999999\- enable the sandbox mode */
1252 -- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
1253 CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
1254 SET GLOBAL gtid_slave_pos='0-2-1003';
1255
1256 2. --master-data=2
1257
1258-/*!999999\- enable the sandbox mode */
1259+/*M!999999\- enable the sandbox mode */
1260 -- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
1261 -- CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
1262 -- SET GLOBAL gtid_slave_pos='0-2-1003';
1263
1264 3. --master-data --single-transaction
1265
1266-/*!999999\- enable the sandbox mode */
1267+/*M!999999\- enable the sandbox mode */
1268 -- CHANGE MASTER TO MASTER_LOG_FILE='slave-bin.000001', MASTER_LOG_POS=BINLOG_START;
1269 CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
1270 SET GLOBAL gtid_slave_pos='0-2-1003';
1271diff --git a/mysql-test/main/trigger_wl3253.result b/mysql-test/main/trigger_wl3253.result
1272index 6d77ed5e..a6e3881a 100644
1273--- a/mysql-test/main/trigger_wl3253.result
1274+++ b/mysql-test/main/trigger_wl3253.result
1275@@ -310,7 +310,7 @@ CREATE TABLE t1 (a INT);
1276 CREATE TRIGGER tr1_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1;
1277 CREATE TRIGGER tr2_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=2;
1278 CREATE TRIGGER tr1_bu BEFORE UPDATE ON t1 FOR EACH ROW SET @a:=3;
1279-/*!999999\- enable the sandbox mode */
1280+/*M!999999\- enable the sandbox mode */
1281 /*!40101 SET @saved_cs_client = @@character_set_client */;
1282 /*!40101 SET character_set_client = utf8 */;
1283 CREATE TABLE `t1` (
1284@@ -373,7 +373,7 @@ CREATE TRIGGER tr2_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=2;
1285 CREATE TRIGGER tr0_bi BEFORE INSERT ON t1 FOR EACH ROW PRECEDES tr1_bi SET @a:=0;
1286 CREATE TRIGGER tr1_1_bi BEFORE INSERT ON t1 FOR EACH ROW FOLLOWS tr1_bi SET @a:=0;
1287 # Expected order of triggers in the dump is: tr0_bi, tr1_bi, tr1_1_bi, tr2_i.
1288-/*!999999\- enable the sandbox mode */
1289+/*M!999999\- enable the sandbox mode */
1290 /*!40101 SET @saved_cs_client = @@character_set_client */;
1291 /*!40101 SET character_set_client = utf8 */;
1292 CREATE TABLE `t1` (
1293diff --git a/mysql-test/suite/archive/archive_bitfield.result b/mysql-test/suite/archive/archive_bitfield.result
1294index 5cda525e..a42f4c68 100644
1295--- a/mysql-test/suite/archive/archive_bitfield.result
1296+++ b/mysql-test/suite/archive/archive_bitfield.result
1297@@ -180,7 +180,7 @@ INSERT INTO `t1` VALUES
1298 (NULL,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'100000',b'010010',b'011111',4,5,5,5,5,5,5,5,5,5,3,2,1),
1299 (NULL,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000000',b'001100',b'111111',4,5,5,5,5,5,5,5,5,5,3,2,1),
1300 (NULL,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'111111',b'000000',b'000000',4,5,5,5,5,5,5,5,5,5,3,2,1);
1301-/*!999999\- enable the sandbox mode */
1302+/*M!999999\- enable the sandbox mode */
1303 INSERT INTO `t1` VALUES (1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x01,0x3F,0x3E,4,5,5,5,5,5,5,5,5,5,3,2,1);
1304 INSERT INTO `t1` VALUES (2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x02,0x00,0x3D,4,5,5,5,5,5,5,5,5,5,3,2,1);
1305 INSERT INTO `t1` VALUES (3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x04,0x0F,0x3B,4,5,5,5,5,5,5,5,5,5,3,2,1);
1306diff --git a/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result b/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
1307index 8084bd44..d5e0c942 100644
1308--- a/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
1309+++ b/mysql-test/suite/compat/oracle/r/sp-package-mysqldump.result
1310@@ -34,7 +34,7 @@ PROCEDURE p1;
1311 FUNCTION f1 RETURN INT;
1312 END;
1313 $$
1314-/*!999999\- enable the sandbox mode */
1315+/*M!999999\- enable the sandbox mode */
1316
1317 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1318 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1319diff --git a/mysql-test/suite/federated/federatedx.result b/mysql-test/suite/federated/federatedx.result
1320index 333b3ca8..f5f480b5 100644
1321--- a/mysql-test/suite/federated/federatedx.result
1322+++ b/mysql-test/suite/federated/federatedx.result
1323@@ -2243,7 +2243,7 @@ connection master;
1324 CREATE TABLE t1(id VARCHAR(20) NOT NULL, PRIMARY KEY(id)) ENGINE=FEDERATED
1325 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';
1326 # Dump table t1 using mysqldump tool
1327-/*!999999\- enable the sandbox mode */
1328+/*M!999999\- enable the sandbox mode */
1329 /*!40101 SET @saved_cs_client = @@character_set_client */;
1330 /*!40101 SET character_set_client = utf8 */;
1331 CREATE TABLE `t1` (
1332diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result
1333index a321ad9a..32607533 100644
1334--- a/mysql-test/suite/roles/definer.result
1335+++ b/mysql-test/suite/roles/definer.result
1336@@ -274,7 +274,7 @@ a b c
1337 111 4 0
1338 2 20 200
1339 delete from t1 where a=111;
1340-/*!999999\- enable the sandbox mode */
1341+/*M!999999\- enable the sandbox mode */
1342
1343 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
1344
1345diff --git a/mysql-test/suite/s3/mysqldump.result b/mysql-test/suite/s3/mysqldump.result
1346index e0c0caf6..3d7b3b37 100644
1347--- a/mysql-test/suite/s3/mysqldump.result
1348+++ b/mysql-test/suite/s3/mysqldump.result
1349@@ -4,7 +4,7 @@ alter table t1 engine=S3;
1350 #####
1351 # mysqldump with --copy-s3-tables=0 (by default)
1352 ###
1353-/*!999999\- enable the sandbox mode */
1354+/*M!999999\- enable the sandbox mode */
1355 #####
1356 # mysqldump with --copy-s3-tables=0 (by default) XML
1357 ###
1358@@ -16,7 +16,7 @@ alter table t1 engine=S3;
1359 #####
1360 # mysqldump with --copy-s3-tables=1
1361 ###
1362-/*!999999\- enable the sandbox mode */
1363+/*M!999999\- enable the sandbox mode */
1364 /*!40101 SET @saved_cs_client = @@character_set_client */;
1365 /*!40101 SET character_set_client = utf8 */;
1366 CREATE TABLE `t1` (
1367diff --git a/mysql-test/suite/sql_sequence/mysqldump.result b/mysql-test/suite/sql_sequence/mysqldump.result
1368index c2f8dea9..2568c8ef 100644
1369--- a/mysql-test/suite/sql_sequence/mysqldump.result
1370+++ b/mysql-test/suite/sql_sequence/mysqldump.result
1371@@ -3,7 +3,7 @@ CREATE TABLE t1(a INT, KEY (a)) KEY_BLOCK_SIZE=1024;
1372 insert into t1 values (1),(2);
1373 CREATE SEQUENCE x1 engine=innodb;
1374 # dump whole database
1375-/*!999999\- enable the sandbox mode */
1376+/*M!999999\- enable the sandbox mode */
1377 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1378 SELECT SETVAL(`a1`, 1, 0);
1379 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1380@@ -19,7 +19,7 @@ INSERT INTO `t1` VALUES
1381 (1),
1382 (2);
1383 # dump by tables order 1
1384-/*!999999\- enable the sandbox mode */
1385+/*M!999999\- enable the sandbox mode */
1386 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1387 SELECT SETVAL(`a1`, 1, 0);
1388 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1389@@ -35,7 +35,7 @@ INSERT INTO `t1` VALUES
1390 (1),
1391 (2);
1392 # dump by tables order 2
1393-/*!999999\- enable the sandbox mode */
1394+/*M!999999\- enable the sandbox mode */
1395 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1396 SELECT SETVAL(`a1`, 1, 0);
1397 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1398@@ -51,7 +51,7 @@ INSERT INTO `t1` VALUES
1399 (1),
1400 (2);
1401 # dump by tables only tables
1402-/*!999999\- enable the sandbox mode */
1403+/*M!999999\- enable the sandbox mode */
1404 /*!40101 SET @saved_cs_client = @@character_set_client */;
1405 /*!40101 SET character_set_client = utf8 */;
1406 CREATE TABLE `t1` (
1407@@ -63,7 +63,7 @@ INSERT INTO `t1` VALUES
1408 (1),
1409 (2);
1410 # dump by tables only sequences
1411-/*!999999\- enable the sandbox mode */
1412+/*M!999999\- enable the sandbox mode */
1413 CREATE SEQUENCE `a1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=Aria;
1414 SELECT SETVAL(`a1`, 1, 0);
1415 CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB;
1416diff --git a/storage/connect/mysql-test/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result
1417index e91d17f7..379fc8ec 100644
1418--- a/storage/connect/mysql-test/connect/r/mysql.result
1419+++ b/storage/connect/mysql-test/connect/r/mysql.result
1420@@ -229,7 +229,7 @@ a
1421 20
1422 30
1423 # Start of mysqldump ------
1424-/*!999999\- enable the sandbox mode */
1425+/*M!999999\- enable the sandbox mode */
1426 /*!40101 SET @saved_cs_client = @@character_set_client */;
1427 /*!40101 SET character_set_client = utf8 */;
1428 CREATE TABLE `t2` (
1429--
14302.40.0
1431
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-04 23:13:56 +0000