Merge 10.3 into 10.4

26 files changed, 1349 insertions, 19 deletions

diff --git a/mysql-test/lib/My/Debugger.pm b/mysql-test/lib/My/Debugger.pm
index cc151b233d5..8d09189e766 100644
--- a/mysql-test/lib/My/Debugger.pm
+++ b/mysql-test/lib/My/Debugger.pm
@@ -147,7 +147,8 @@ sub do_args($$$$$) {
   my %vars = (
     vardir => $::opt_vardir,
     exe => $$exe,
-    args => join(' ', map { quote_from_mtr $_ } @$$args, '--loose-gdb'),
+    args => join(' ', map { quote_from_mtr $_ } @$$args,
+                 '--loose-debug-gdb', '--loose-skip-stack-trace'),
     input => $input,
     script => "$::opt_vardir/tmp/${k}init.$type",
     log => "$::opt_vardir/log/$type.$k",
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result
index 3c59b83f2ce..f6c17d4de8c 100644
--- a/mysql-test/main/alter_table.result
+++ b/mysql-test/main/alter_table.result
@@ -2585,6 +2585,22 @@ set max_statement_time= 0;
 drop table t1;
 drop view v1;
 #
+# MDEV-25803 Inplace ALTER breaks MyISAM/Aria tables when order of keys is changed
+#
+set @save_default_engine= @@default_storage_engine;
+create or replace table t1 (x int, y int, unique (y), unique (x), primary key(x)) engine myisam;
+alter table t1 change x xx int, algorithm=inplace;
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+create or replace table t1 (x int, y int, unique (y), unique (x), primary key(x));
+alter table t1 change x xx int, algorithm=inplace;
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+drop table t1;
+set @@default_storage_engine= @save_default_engine;
+#
 # End of 10.3 tests
 #
 #
diff --git a/mysql-test/main/alter_table.test b/mysql-test/main/alter_table.test
index fa931fcadbf..6dcb441d30a 100644
--- a/mysql-test/main/alter_table.test
+++ b/mysql-test/main/alter_table.test
@@ -2100,6 +2100,47 @@ drop table t1;
 drop view v1;
 
 --echo #
+--echo # MDEV-25803 Inplace ALTER breaks MyISAM/Aria tables when order of keys is changed
+--echo #
+set @save_default_engine= @@default_storage_engine;
+--disable_query_log
+if ($MTR_COMBINATION_INNODB)
+{
+  set default_storage_engine= innodb;
+}
+if ($MTR_COMBINATION_ARIA)
+{
+  set default_storage_engine= aria;
+}
+--enable_query_log
+
+if (!$MTR_COMBINATION_INNODB)
+{
+  --disable_query_log
+  --disable_result_log
+  # There is no inplace ADD INDEX for MyISAM/Aria:
+  create or replace table t1 (x int);
+  --error ER_ALTER_OPERATION_NOT_SUPPORTED
+  alter table t1 add unique (x), algorithm=inplace;
+  --error ER_ALTER_OPERATION_NOT_SUPPORTED
+  alter table t1 add primary key(x), algorithm=inplace;
+  --error ER_ALTER_OPERATION_NOT_SUPPORTED
+  alter table t1 add index(x), algorithm=inplace;
+  --enable_query_log
+  --enable_result_log
+}
+
+create or replace table t1 (x int, y int, unique (y), unique (x), primary key(x)) engine myisam;
+alter table t1 change x xx int, algorithm=inplace;
+check table t1;
+create or replace table t1 (x int, y int, unique (y), unique (x), primary key(x));
+alter table t1 change x xx int, algorithm=inplace;
+check table t1;
+# cleanup
+drop table t1;
+set @@default_storage_engine= @save_default_engine;
+
+--echo #
 --echo # End of 10.3 tests
 --echo #
 
diff --git a/mysql-test/main/ctype_cp850.result b/mysql-test/main/ctype_cp850.result
index c028f72b58a..c6aba9d3f4e 100644
--- a/mysql-test/main/ctype_cp850.result
+++ b/mysql-test/main/ctype_cp850.result
@@ -12,3 +12,1053 @@ DROP TABLE t1;
 #
 # End of 5.5 tests
 #
+#
+# Start of 10.2 tests
+#
+#
+# MDEV-25610 Assertion `escape != -1' failed in Item_func_like::val_int
+#
+SET NAMES cp850;
+SELECT '' LIKE '' ESCAPE _cp850 0xFF;
+'' LIKE '' ESCAPE _cp850 0xFF
+1
+BEGIN NOT ATOMIC
+DECLARE ch INT DEFAULT 0x00;
+DECLARE query TEXT DEFAULT 'SELECT _cp850'''' LIKE _cp850'''' ESCAPE _cp850 0xFF';
+WHILE ch <= 0xFF DO
+SET @query= REPLACE(query, 'FF', CONV(ch, 10, 16));
+SELECT @query;
+PREPARE stmt FROM @query;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+SET ch=ch+1;
+END WHILE;
+END;
+$$
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x0
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x0
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x1
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x1
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x2
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x2
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x3
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x3
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x4
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x4
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x5
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x5
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x6
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x6
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x7
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x7
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x8
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x8
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x9
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x9
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x10
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x10
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x11
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x11
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x12
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x12
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x13
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x13
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x14
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x14
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x15
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x15
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x16
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x16
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x17
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x17
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x18
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x18
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x19
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x19
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x1A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x1A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x1B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x1B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x1C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x1C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x1D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x1D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x1E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x1E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x1F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x1F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x20
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x20
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x21
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x21
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x22
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x22
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x23
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x23
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x24
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x24
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x25
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x25
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x26
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x26
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x27
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x27
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x28
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x28
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x29
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x29
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x2A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x2A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x2B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x2B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x2C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x2C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x2D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x2D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x2E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x2E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x2F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x2F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x30
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x30
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x31
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x31
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x32
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x32
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x33
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x33
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x34
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x34
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x35
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x35
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x36
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x36
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x37
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x37
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x38
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x38
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x39
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x39
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x3A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x3A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x3B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x3B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x3C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x3C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x3D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x3D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x3E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x3E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x3F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x3F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x40
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x40
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x41
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x41
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x42
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x42
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x43
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x43
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x44
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x44
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x45
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x45
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x46
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x46
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x47
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x47
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x48
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x48
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x49
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x49
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x4A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x4A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x4B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x4B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x4C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x4C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x4D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x4D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x4E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x4E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x4F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x4F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x50
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x50
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x51
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x51
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x52
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x52
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x53
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x53
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x54
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x54
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x55
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x55
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x56
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x56
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x57
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x57
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x58
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x58
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x59
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x59
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x5A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x5A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x5B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x5B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x5C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x5C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x5D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x5D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x5E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x5E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x5F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x5F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x60
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x60
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x61
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x61
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x62
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x62
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x63
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x63
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x64
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x64
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x65
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x65
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x66
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x66
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x67
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x67
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x68
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x68
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x69
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x69
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x6A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x6A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x6B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x6B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x6C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x6C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x6D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x6D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x6E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x6E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x6F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x6F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x70
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x70
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x71
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x71
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x72
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x72
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x73
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x73
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x74
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x74
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x75
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x75
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x76
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x76
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x77
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x77
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x78
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x78
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x79
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x79
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x7A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x7A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x7B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x7B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x7C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x7C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x7D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x7D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x7E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x7E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x7F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x7F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x80
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x80
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x81
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x81
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x82
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x82
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x83
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x83
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x84
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x84
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x85
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x85
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x86
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x86
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x87
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x87
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x88
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x88
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x89
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x89
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x8A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x8A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x8B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x8B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x8C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x8C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x8D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x8D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x8E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x8E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x8F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x8F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x90
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x90
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x91
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x91
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x92
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x92
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x93
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x93
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x94
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x94
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x95
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x95
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x96
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x96
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x97
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x97
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x98
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x98
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x99
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x99
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x9A
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x9A
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x9B
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x9B
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x9C
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x9C
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x9D
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x9D
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x9E
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x9E
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0x9F
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0x9F
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA0
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA0
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA1
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA1
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA2
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA2
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA3
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA3
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA4
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA4
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA5
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA5
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA6
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA6
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA7
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA7
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA8
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA8
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xA9
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xA9
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xAA
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xAA
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xAB
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xAB
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xAC
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xAC
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xAD
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xAD
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xAE
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xAE
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xAF
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xAF
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB0
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB0
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB1
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB1
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB2
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB2
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB3
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB3
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB4
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB4
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB5
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB5
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB6
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB6
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB7
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB7
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB8
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB8
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xB9
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xB9
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xBA
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xBA
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xBB
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xBB
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xBC
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xBC
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xBD
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xBD
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xBE
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xBE
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xBF
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xBF
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC0
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC0
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC1
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC1
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC2
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC2
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC3
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC3
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC4
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC4
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC5
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC5
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC6
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC6
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC7
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC7
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC8
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC8
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xC9
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xC9
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xCA
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xCA
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xCB
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xCB
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xCC
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xCC
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xCD
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xCD
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xCE
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xCE
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xCF
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xCF
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD0
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD0
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD1
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD1
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD2
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD2
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD3
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD3
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD4
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD4
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD5
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD5
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD6
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD6
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD7
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD7
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD8
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD8
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xD9
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xD9
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xDA
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xDA
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xDB
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xDB
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xDC
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xDC
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xDD
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xDD
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xDE
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xDE
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xDF
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xDF
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE0
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE0
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE1
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE1
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE2
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE2
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE3
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE3
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE4
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE4
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE5
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE5
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE6
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE6
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE7
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE7
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE8
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE8
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xE9
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xE9
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xEA
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xEA
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xEB
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xEB
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xEC
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xEC
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xED
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xED
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xEE
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xEE
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xEF
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xEF
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF0
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF0
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF1
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF1
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF2
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF2
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF3
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF3
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF4
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF4
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF5
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF5
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF6
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF6
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF7
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF7
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF8
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF8
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xF9
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xF9
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xFA
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xFA
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xFB
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xFB
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xFC
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xFC
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xFD
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xFD
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xFE
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xFE
+1
+@query
+SELECT _cp850'' LIKE _cp850'' ESCAPE _cp850 0xFF
+_cp850'' LIKE _cp850'' ESCAPE _cp850 0xFF
+1
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/main/ctype_cp850.test b/mysql-test/main/ctype_cp850.test
index 358829eb351..d2fac6f3646 100644
--- a/mysql-test/main/ctype_cp850.test
+++ b/mysql-test/main/ctype_cp850.test
@@ -14,3 +14,35 @@ DROP TABLE t1;
 --echo #
 --echo # End of 5.5 tests
 --echo #
+
+--echo #
+--echo # Start of 10.2 tests
+--echo #
+
+--echo #
+--echo # MDEV-25610 Assertion `escape != -1' failed in Item_func_like::val_int
+--echo #
+
+SET NAMES cp850;
+SELECT '' LIKE '' ESCAPE _cp850 0xFF;
+
+DELIMITER $$;
+BEGIN NOT ATOMIC
+  DECLARE ch INT DEFAULT 0x00;
+  DECLARE query TEXT DEFAULT 'SELECT _cp850'''' LIKE _cp850'''' ESCAPE _cp850 0xFF';
+  WHILE ch <= 0xFF DO
+    SET @query= REPLACE(query, 'FF', CONV(ch, 10, 16));
+    SELECT @query;
+    PREPARE stmt FROM @query;
+    EXECUTE stmt;
+    DEALLOCATE PREPARE stmt;
+    SET ch=ch+1;
+  END WHILE;
+END;
+$$
+DELIMITER ;$$
+
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
diff --git a/mysql-test/main/ctype_cp866.result b/mysql-test/main/ctype_cp866.result
new file mode 100644
index 00000000000..008f94f3c79
--- /dev/null
+++ b/mysql-test/main/ctype_cp866.result
@@ -0,0 +1,12 @@
+#
+# Start of 10.2 tests
+#
+#
+# MDEV-25610 Assertion `escape != -1' failed in Item_func_like::val_int
+#
+SELECT _cp866'' LIKE _cp866'' ESCAPE _cp866 0xFF;
+_cp866'' LIKE _cp866'' ESCAPE _cp866 0xFF
+1
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/main/ctype_cp866.test b/mysql-test/main/ctype_cp866.test
new file mode 100644
index 00000000000..cdc694d2fc7
--- /dev/null
+++ b/mysql-test/main/ctype_cp866.test
@@ -0,0 +1,14 @@
+--echo #
+--echo # Start of 10.2 tests
+--echo #
+
+--echo #
+--echo # MDEV-25610 Assertion `escape != -1' failed in Item_func_like::val_int
+--echo #
+
+SELECT _cp866'' LIKE _cp866'' ESCAPE _cp866 0xFF;
+
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
diff --git a/mysql-test/main/ctype_tis620.result b/mysql-test/main/ctype_tis620.result
index 9650c366d38..d0c30a112e3 100644
--- a/mysql-test/main/ctype_tis620.result
+++ b/mysql-test/main/ctype_tis620.result
@@ -4421,5 +4421,14 @@ DROP TABLE t1;
 #
 SET STORAGE_ENGINE=Default;
 #
+# MDEV-24901 SIGSEGV in fts_get_table_name, SIGSEGV in ib_vector_size, SIGSEGV in row_merge_fts_doc_tokenize, stack smashing
+#
+SELECT HEX(WEIGHT_STRING(_tis620 'a\0b'));
+HEX(WEIGHT_STRING(_tis620 'a\0b'))
+610062
+SELECT HEX(WEIGHT_STRING(_tis620 'a\0b' COLLATE tis620_thai_nopad_ci));
+HEX(WEIGHT_STRING(_tis620 'a\0b' COLLATE tis620_thai_nopad_ci))
+610062
+#
 # End of 10.2 tests
 #
diff --git a/mysql-test/main/ctype_tis620.test b/mysql-test/main/ctype_tis620.test
index 7bc248aec2b..7f6382fe7bc 100644
--- a/mysql-test/main/ctype_tis620.test
+++ b/mysql-test/main/ctype_tis620.test
@@ -210,5 +210,12 @@ let $coll_pad='tis620_bin';
 --source include/ctype_pad_all_engines.inc
 
 --echo #
+--echo # MDEV-24901 SIGSEGV in fts_get_table_name, SIGSEGV in ib_vector_size, SIGSEGV in row_merge_fts_doc_tokenize, stack smashing
+--echo #
+
+SELECT HEX(WEIGHT_STRING(_tis620 'a\0b'));
+SELECT HEX(WEIGHT_STRING(_tis620 'a\0b' COLLATE tis620_thai_nopad_ci));
+
+--echo #
 --echo # End of 10.2 tests
 --echo #
diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result
index 7235cba31b7..34f7530e815 100644
--- a/mysql-test/main/ctype_utf8.result
+++ b/mysql-test/main/ctype_utf8.result
@@ -11258,6 +11258,17 @@ DROP TABLE kv;
 DROP VIEW v1;
 SET NAMES utf8;
 #
+# MDEV-24335 Unexpected question mark in the end of a TINYTEXT column
+#
+CREATE TABLE t1 (a TINYTEXT character set utf8);
+INSERT IGNORE INTO t1 VALUES (REPEAT(_utf8 0xD184, 250));
+Warnings:
+Warning	1366	Incorrect string value: '\xD1\x84\xD1\x84\xD1\x84...' for column `test`.`t1`.`a` at row 1
+SELECT LENGTH(a), CHAR_LENGTH(a), RIGHT(a,3) FROM t1;
+LENGTH(a)	CHAR_LENGTH(a)	RIGHT(a,3)
+254	127	ффф
+DROP TABLE t1;
+#
 # End of 10.2 tests
 #
 #
diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test
index 2e1f1e230f1..e2c47e75993 100644
--- a/mysql-test/main/ctype_utf8.test
+++ b/mysql-test/main/ctype_utf8.test
@@ -2184,6 +2184,15 @@ DROP VIEW v1;
 SET NAMES utf8;
 
 --echo #
+--echo # MDEV-24335 Unexpected question mark in the end of a TINYTEXT column
+--echo #
+
+CREATE TABLE t1 (a TINYTEXT character set utf8);
+INSERT IGNORE INTO t1 VALUES (REPEAT(_utf8 0xD184, 250));
+SELECT LENGTH(a), CHAR_LENGTH(a), RIGHT(a,3) FROM t1;
+DROP TABLE t1;
+
+--echo #
 --echo # End of 10.2 tests
 --echo #
 
diff --git a/mysql-test/main/long_unique.result b/mysql-test/main/long_unique.result
index eb61a080c96..23d25e2f124 100644
--- a/mysql-test/main/long_unique.result
+++ b/mysql-test/main/long_unique.result
@@ -596,17 +596,17 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   UNIQUE KEY `db_row_hash_1` (`db_row_hash_1`),
   UNIQUE KEY `db_row_hash_2` (`db_row_hash_2`),
+  UNIQUE KEY `d` (`d`) USING HASH,
   UNIQUE KEY `e` (`e`),
-  UNIQUE KEY `a` (`a`),
-  UNIQUE KEY `d` (`d`) USING HASH
+  UNIQUE KEY `a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	db_row_hash_1	1	db_row_hash_1	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	db_row_hash_2	1	db_row_hash_2	A	NULL	NULL	NULL	YES	BTREE		
+t1	0	d	1	d	A	NULL	NULL	NULL	YES	HASH		
 t1	0	e	1	e	A	NULL	NULL	NULL	YES	BTREE		
 t1	0	a	1	a	A	NULL	NULL	NULL	YES	BTREE		
-t1	0	d	1	d	A	NULL	NULL	NULL	YES	HASH		
 alter table t1 add column clm1 blob unique,add column clm2 blob unique;
 #try changing the name; 
 alter table t1 change column clm1 clm_changed1 blob, change column clm2 clm_changed2 blob;
@@ -1478,3 +1478,4 @@ SELECT t2.b FROM t1 JOIN t2 ON t1.d = t2.f WHERE t2.pk >= 20;
 b
 drop table t1,t2;
 set @@GLOBAL.max_allowed_packet= @allowed_packet;
+# End of 10.4 tests
diff --git a/mysql-test/main/long_unique.test b/mysql-test/main/long_unique.test
index c0bd77ca5c9..7aaff303ae7 100644
--- a/mysql-test/main/long_unique.test
+++ b/mysql-test/main/long_unique.test
@@ -557,3 +557,4 @@ SELECT t2.b FROM t1 JOIN t2 ON t1.d = t2.f WHERE t2.pk >= 20;
 drop table t1,t2;
 
 set @@GLOBAL.max_allowed_packet= @allowed_packet;
+--echo # End of 10.4 tests
diff --git a/mysql-test/main/long_unique_bugs.result b/mysql-test/main/long_unique_bugs.result
index 738744867c0..bf53b8f1d88 100644
--- a/mysql-test/main/long_unique_bugs.result
+++ b/mysql-test/main/long_unique_bugs.result
@@ -302,3 +302,4 @@ c
 1
 DELETE FROM t;
 DROP TABLE t;
+# End of 10.4 tests
diff --git a/mysql-test/main/long_unique_bugs.test b/mysql-test/main/long_unique_bugs.test
index 319940690ea..b0e6c2b3bf6 100644
--- a/mysql-test/main/long_unique_bugs.test
+++ b/mysql-test/main/long_unique_bugs.test
@@ -384,3 +384,5 @@ SELECT * FROM t;
 DELETE FROM t;
 
 DROP TABLE t;
+
+--echo # End of 10.4 tests
diff --git a/mysql-test/suite/encryption/r/encrypt_and_grep.result b/mysql-test/suite/encryption/r/encrypt_and_grep.result
index 635dca14868..72d612eeac8 100644
--- a/mysql-test/suite/encryption/r/encrypt_and_grep.result
+++ b/mysql-test/suite/encryption/r/encrypt_and_grep.result
@@ -19,6 +19,7 @@ mysql/innodb_table_stats
 mysql/transaction_registry
 test/t1
 test/t2
+FLUSH TABLES t1,t2,t3 FOR EXPORT;
 # t1 yes on expecting NOT FOUND
 NOT FOUND /foobarsecret/ in t1.ibd
 # t2 ... on expecting NOT FOUND
@@ -27,7 +28,7 @@ NOT FOUND /tempsecret/ in t2.ibd
 FOUND 12 /dummysecret/ in t3.ibd
 # ibdata1 expecting NOT FOUND
 NOT FOUND /foobarsecret/ in ibdata1
-# restart
+UNLOCK TABLES;
 # Now turn off encryption and wait for threads to decrypt everything
 SET GLOBAL innodb_encrypt_tables = off;
 # Wait max 10 min for key encryption threads to decrypt all spaces
@@ -42,6 +43,7 @@ test/t3
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 NAME
 test/t1
+FLUSH TABLES t1,t2,t3 FOR EXPORT;
 # t1 yes on expecting NOT FOUND
 NOT FOUND /foobarsecret/ in t1.ibd
 # t2 ... default expecting FOUND
@@ -50,7 +52,7 @@ FOUND 12 /tempsecret/ in t2.ibd
 FOUND 12 /dummysecret/ in t3.ibd
 # ibdata1 expecting NOT FOUND
 NOT FOUND /foobarsecret/ in ibdata1
-# restart
+UNLOCK TABLES;
 # Now turn on encryption and wait for threads to encrypt all spaces
 SET GLOBAL innodb_encrypt_tables = on;
 # Wait max 10 min for key encryption threads to encrypt all spaces
@@ -65,6 +67,7 @@ mysql/innodb_table_stats
 mysql/transaction_registry
 test/t1
 test/t2
+FLUSH TABLES t1,t2,t3 FOR EXPORT;
 # t1 yes on expecting NOT FOUND
 NOT FOUND /foobarsecret/ in t1.ibd
 # t2 ... on expecting NOT FOUND
@@ -73,5 +76,5 @@ NOT FOUND /tempsecret/ in t2.ibd
 FOUND 12 /dummysecret/ in t3.ibd
 # ibdata1 expecting NOT FOUND
 NOT FOUND /foobarsecret/ in ibdata1
-# restart
+UNLOCK TABLES;
 drop table t1, t2, t3;
diff --git a/mysql-test/suite/encryption/t/encrypt_and_grep.test b/mysql-test/suite/encryption/t/encrypt_and_grep.test
index 5fec86304b4..03f67db83f9 100644
--- a/mysql-test/suite/encryption/t/encrypt_and_grep.test
+++ b/mysql-test/suite/encryption/t/encrypt_and_grep.test
@@ -1,9 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/have_file_key_management_plugin.inc
 
-# embedded does not support restart
--- source include/not_embedded.inc
-
 #
 # MDEV-8138: strange results from encrypt-and-grep test
 #
@@ -35,7 +32,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 --sorted_result
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 
---source include/shutdown_mysqld.inc
+FLUSH TABLES t1,t2,t3 FOR EXPORT;
 
 --let SEARCH_PATTERN=foobarsecret
 --echo # t1 yes on expecting NOT FOUND
@@ -54,7 +51,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 -- let SEARCH_FILE=$ib1_IBD
 -- source include/search_pattern_in_file.inc
 
--- source include/start_mysqld.inc
+UNLOCK TABLES;
 
 --echo # Now turn off encryption and wait for threads to decrypt everything
 
@@ -71,7 +68,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 --sorted_result
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 
---source include/shutdown_mysqld.inc
+FLUSH TABLES t1,t2,t3 FOR EXPORT;
 
 --let SEARCH_PATTERN=foobarsecret
 --echo # t1 yes on expecting NOT FOUND
@@ -90,8 +87,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 -- let SEARCH_FILE=$ib1_IBD
 -- source include/search_pattern_in_file.inc
 
-
--- source include/start_mysqld.inc
+UNLOCK TABLES;
 
 --echo # Now turn on encryption and wait for threads to encrypt all spaces
 SET GLOBAL innodb_encrypt_tables = on;
@@ -106,7 +102,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 --sorted_result
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
 
---source include/shutdown_mysqld.inc
+FLUSH TABLES t1,t2,t3 FOR EXPORT;
 
 --let SEARCH_PATTERN=foobarsecret
 --echo # t1 yes on expecting NOT FOUND
@@ -125,6 +121,6 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
 -- let SEARCH_FILE=$ib1_IBD
 -- source include/search_pattern_in_file.inc
 
--- source include/start_mysqld.inc
+UNLOCK TABLES;
 
 drop table t1, t2, t3;
diff --git a/mysql-test/suite/innodb/r/innodb_ctype_tis620.result b/mysql-test/suite/innodb/r/innodb_ctype_tis620.result
new file mode 100644
index 00000000000..164212097bd
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb_ctype_tis620.result
@@ -0,0 +1,28 @@
+SET STORAGE_ENGINE=InnoDB;
+#
+# Start of 10.2 tests
+#
+#
+#  MDEV-24901 SIGSEGV in fts_get_table_name, SIGSEGV in ib_vector_size, SIGSEGV in row_merge_fts_doc_tokenize, stack smashing Export
+#
+CREATE TABLE t1(c TEXT CHARACTER SET tis620);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c` text CHARACTER SET tis620 DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+INSERT INTO t1 VALUES('100');
+ALTER TABLE t1 ADD FULLTEXT INDEX(c), ALGORITHM=INPLACE;
+DROP TABLE t1;
+CREATE TABLE t1(c TEXT CHARACTER SET tis620 COLLATE tis620_thai_nopad_ci);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c` text CHARACTER SET tis620 COLLATE tis620_thai_nopad_ci DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+INSERT INTO t1 VALUES('100');
+ALTER TABLE t1 ADD FULLTEXT INDEX(c), ALGORITHM=INPLACE;
+DROP TABLE t1;
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/suite/innodb/t/innodb_ctype_tis620.test b/mysql-test/suite/innodb/t/innodb_ctype_tis620.test
new file mode 100644
index 00000000000..fee1b283ac3
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb_ctype_tis620.test
@@ -0,0 +1,29 @@
+--source include/have_innodb.inc
+--source include/have_tis620.inc
+
+SET STORAGE_ENGINE=InnoDB;
+
+--echo #
+--echo # Start of 10.2 tests
+--echo #
+
+--echo #
+--echo #  MDEV-24901 SIGSEGV in fts_get_table_name, SIGSEGV in ib_vector_size, SIGSEGV in row_merge_fts_doc_tokenize, stack smashing Export
+--echo #
+
+CREATE TABLE t1(c TEXT CHARACTER SET tis620);
+SHOW CREATE TABLE t1;
+INSERT INTO t1 VALUES('100');
+ALTER TABLE t1 ADD FULLTEXT INDEX(c), ALGORITHM=INPLACE;
+DROP TABLE t1;
+
+CREATE TABLE t1(c TEXT CHARACTER SET tis620 COLLATE tis620_thai_nopad_ci);
+SHOW CREATE TABLE t1;
+INSERT INTO t1 VALUES('100');
+ALTER TABLE t1 ADD FULLTEXT INDEX(c), ALGORITHM=INPLACE;
+DROP TABLE t1;
+
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
index 03d37270eed..17cc6fa0373 100644
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -2882,3 +2882,14 @@ insert into t1 values (8,'0');
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
 unlock tables;
 drop table t1;
+#
+# MDEV-22284 Aria table key read crash because wrong index used
+#
+create table t1 (
+a int auto_increment,
+b int, c int,
+key(c, a), unique(b)
+) engine aria
+partition by hash (b);
+replace into t1 values (1, 0, 0), (2, 0, 0), (0, 0, 0);
+drop table t1;
diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test
index d5b9d839699..3cabba3b1e8 100644
--- a/mysql-test/suite/maria/maria.test
+++ b/mysql-test/suite/maria/maria.test
@@ -2099,3 +2099,16 @@ aria_page_checksum=$default_checksum,
 aria_log_file_size=$default_log_file_size;
 --enable_result_log
 --enable_query_log
+
+--echo #
+--echo # MDEV-22284 Aria table key read crash because wrong index used
+--echo #
+create table t1 (
+    a int auto_increment,
+    b int, c int,
+    key(c, a), unique(b)
+) engine aria
+partition by hash (b);
+replace into t1 values (1, 0, 0), (2, 0, 0), (0, 0, 0);
+# cleanup
+drop table t1;
diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
index 02665c70b9e..c44bfa80ad4 100644
--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
@@ -8,6 +8,7 @@
 # Finish the following tests by calling its common test script:  
 # include/rpl_get_master_version_and_clock.test. 
 
+source include/not_valgrind.inc;
 source include/have_debug.inc;
 source include/have_debug_sync.inc;
 source include/master-slave.inc;
diff --git a/mysql-test/suite/rpl/t/rpl_row_big_table_id.test b/mysql-test/suite/rpl/t/rpl_row_big_table_id.test
index abf22cc876e..d898e894bc6 100644
--- a/mysql-test/suite/rpl/t/rpl_row_big_table_id.test
+++ b/mysql-test/suite/rpl/t/rpl_row_big_table_id.test
@@ -7,6 +7,7 @@
 # Verify row-based events applying when table map id value is about and greater
 # than 1 << 32.
 ##################################################################
+--source include/not_valgrind.inc
 --source include/word_size.inc
 --source include/have_debug.inc
 --source include/have_binlog_format_row.inc
diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result
index 75f7b560f30..1197a0e805a 100644
--- a/mysql-test/suite/versioning/r/create.result
+++ b/mysql-test/suite/versioning/r/create.result
@@ -611,3 +611,28 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`id`)
 ) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 drop table t1;
+#
+# MDEV-26928 Column-inclusive WITH SYSTEM VERSIONING doesn't work with explicit system fields
+#
+create or replace table t1 (x int, y int with system versioning);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `x` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING,
+  `y` int(11) DEFAULT NULL
+) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
+create or replace table t1 (
+x int, y int with system versioning,
+row_start timestamp(6) as row start,
+row_end timestamp(6) as row end,
+period for system_time(row_start, row_end));
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `x` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING,
+  `y` int(11) DEFAULT NULL,
+  `row_start` timestamp(6) GENERATED ALWAYS AS ROW START WITHOUT SYSTEM VERSIONING,
+  `row_end` timestamp(6) GENERATED ALWAYS AS ROW END WITHOUT SYSTEM VERSIONING,
+  PERIOD FOR SYSTEM_TIME (`row_start`, `row_end`)
+) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
+drop table t1;
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index 9ccc900cd12..6bb2f352e52 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -611,8 +611,7 @@ delete from t1;
 delete from t1;
 check table t1;
 Table	Op	Msg_type	Msg_text
-test.t1	check	note	Not supported for non-INTERVAL history partitions
-test.t1	check	note	The storage engine for the table doesn't support check
+test.t1	check	status	OK
 drop table t1;
 #
 # MDEV-21233 Assertion `m_extra_cache' failed in ha_partition::late_extra_cache
diff --git a/mysql-test/suite/versioning/t/create.test b/mysql-test/suite/versioning/t/create.test
index 6f8cff3ca2e..61fac4d6a1f 100644
--- a/mysql-test/suite/versioning/t/create.test
+++ b/mysql-test/suite/versioning/t/create.test
@@ -451,3 +451,20 @@ show index from t1;
 --replace_result $default_engine DEFAULT_ENGINE
 show create table t1;
 drop table t1;
+
+--echo #
+--echo # MDEV-26928 Column-inclusive WITH SYSTEM VERSIONING doesn't work with explicit system fields
+--echo #
+create or replace table t1 (x int, y int with system versioning);
+--replace_result $default_engine DEFAULT_ENGINE
+show create table t1;
+
+create or replace table t1 (
+    x int, y int with system versioning,
+    row_start timestamp(6) as row start,
+    row_end timestamp(6) as row end,
+    period for system_time(row_start, row_end));
+--replace_result $default_engine DEFAULT_ENGINE
+show create table t1;
+
+drop table t1;