Merge branch '10.3' into 10.4

6 files changed, 19 insertions, 4 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test b/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test
index 9ee58aa5217..3ebdd67a1a6 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/concurrent_alter.test
@@ -32,6 +32,8 @@ EOF
 
 --exec bash $MYSQL_TMP_DIR/concurrent_alter.sh
 
+let $server_charset=`select @@character_set_server`;
+--replace_result $server_charset DEFAULT_CHARSET
 SHOW CREATE TABLE a1;
 
 DROP DATABASE mysqlslap;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
index 45d6767f656..11c9c08c36e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
+++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
@@ -93,4 +93,5 @@ information_schema: MDEV-14372: unstable testcase
 
 mysqlbinlog_gtid_skip_empty_trans_rocksdb : MariaRocks: requires GTIDs
 drop_table: Hangs on shutdown
+add_index_inplace: not stable result
 rocksdb_range2 : result difference, update after MDEV-16746 is fixed
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/records_in_range.test b/storage/rocksdb/mysql-test/rocksdb/t/records_in_range.test
index 15db3288084..68fb1a09526 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/records_in_range.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/records_in_range.test
@@ -1,6 +1,6 @@
 --source include/have_rocksdb.inc
-
 --source include/restart_mysqld.inc
+--source include/default_optimizer_switch.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test
index b62002b0020..0369e758f5d 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test
@@ -3,7 +3,12 @@
 # Important:
 # The test needs to be run with --mysqld=--query-cache-type=1
 
--- source include/have_query_cache.inc
+--source include/have_query_cache.inc
+set @save_query_cache_type=@@global.query_cache_type;
+set @save_query_cache_size=@@global.query_cache_size;
+set @@global.query_cache_type=1;
+set @@global.query_cache_size=1024*1024;
+
 --enable_connect_log
 
 create table t1 (pk int primary key, c char(8)) engine=RocksDB;
@@ -30,3 +35,9 @@ show status like 'Qcache_not_cached';
 show global status like 'Qcache_hits';
 
 drop table t1;
+
+#
+# Cleanup
+#
+set @@global.query_cache_type=@save_query_cache_type;
+set @@global.query_cache_size=@save_query_cache_size;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/select.test b/storage/rocksdb/mysql-test/rocksdb/t/select.test
index c4e1ad464a3..3d9bdc7b4b8 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/select.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/select.test
@@ -40,11 +40,11 @@ SELECT SQL_BIG_RESULT SQL_CALC_FOUND_ROWS DISTINCT(t2.a)
   FROM t1 t1_1, t2, t1 t1_2;
 SELECT FOUND_ROWS();
 
-let $query_cache = `SELECT @@query_cache_size`;
+SET @save_query_cache=@@global.query_cache_size;
 SET GLOBAL query_cache_size = 1024*1024;
 --sorted_result
 SELECT SQL_CACHE * FROM t1, t2;
-eval SET GLOBAL query_cache_size = $query_cache;
+SET @@global.query_cache_size=@save_query_cache;
 
 # Combination of main clauses
 
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/ttl_rows_examined.test b/storage/rocksdb/mysql-test/rocksdb/t/ttl_rows_examined.test
index f9e871ff1c8..714c2c6056c 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/ttl_rows_examined.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/ttl_rows_examined.test
@@ -38,6 +38,7 @@ connection conn2;
 set debug_sync='now WAIT_FOR parked';
 
 # display "Rows Examined" before returning from call
+--replace_result Execute Query
 --replace_column 1 ### 2 ### 3 ### 4 ### 6 ### 10 ### 11 ### 12 ###
 --sorted_result
 SHOW PROCESSLIST;