Trivial post-merge fixes

storage/rocksdb/mysql-test/rocksdb/r/autoinc_debug.result

@@ -2,7 +2,7 @@
 # Testing upgrading from server without merges for auto_increment
 # to new server with such support.
 #
-set debug='+d,myrocks_autoinc_upgrade';
+set debug_dbug='+d,myrocks_autoinc_upgrade';
 create table t (i int primary key auto_increment);
 insert into t values ();
 insert into t values ();
@@ -20,7 +20,7 @@ select table_name, index_name, auto_increment
 from information_schema.rocksdb_ddl where table_name = 't';
 table_name	index_name	auto_increment
 t	PRIMARY	NULL
-set debug='-d,myrocks_autoinc_upgrade';
+set debug_dbug='-d,myrocks_autoinc_upgrade';
 insert into t values ();
 insert into t values ();
 insert into t values ();
@@ -56,7 +56,7 @@ insert into t values ();
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_before";
+set debug_dbug="+d,crash_commit_before";
 commit;
 ERROR HY000: Lost connection to MySQL server during query
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
@@ -69,7 +69,7 @@ max(i)
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_after_prepare";
+set debug_dbug="+d,crash_commit_after_prepare";
 commit;
 ERROR HY000: Lost connection to MySQL server during query
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
@@ -82,7 +82,7 @@ max(i)
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_after_log";
+set debug_dbug="+d,crash_commit_after_log";
 commit;
 ERROR HY000: Lost connection to MySQL server during query
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';
@@ -95,7 +95,7 @@ max(i)
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_after";
+set debug_dbug="+d,crash_commit_after";
 commit;
 ERROR HY000: Lost connection to MySQL server during query
 select table_schema, table_name, auto_increment from information_schema.tables where table_name = 't';

storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result

 create table t1 (pk int primary key) engine=rocksdb;
 show tables;
-set session debug_dbug="+d,gen_sql_table_name";
 Tables_in_test
 #mysql50#t1#sql-test
 t1
+set session debug_dbug="+d,gen_sql_table_name";
 rename table t1 to t2;
 set session debug_dbug= "-d,gen_sql_table_name";
 show tables;

storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_read_filtering.result

@@ -210,8 +210,8 @@ select variable_value-@a from information_schema.global_status where variable_na
 variable_value-@a
 1
 # Switching to connection 1
-select variable_value into @a from information_schema.global_status where variable_name='rocksdb_rows_filtered';
 connection con1;
+select variable_value into @a from information_schema.global_status where variable_name='rocksdb_rows_filtered';
 SELECT * FROM t1;
 a
 1

storage/rocksdb/mysql-test/rocksdb/t/autoinc_debug.test

@@ -7,7 +7,7 @@
 --echo # to new server with such support.
 --echo #
 
-set debug='+d,myrocks_autoinc_upgrade';
+set debug_dbug='+d,myrocks_autoinc_upgrade';
 create table t (i int primary key auto_increment);
 insert into t values ();
 insert into t values ();
@@ -20,7 +20,7 @@ select * from t;
 select table_name, index_name, auto_increment
   from information_schema.rocksdb_ddl where table_name = 't';
 
-set debug='-d,myrocks_autoinc_upgrade';
+set debug_dbug='-d,myrocks_autoinc_upgrade';
 
 --source include/restart_mysqld.inc
 
@@ -55,7 +55,7 @@ insert into t values ();
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_before";
+set debug_dbug="+d,crash_commit_before";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
 commit;
@@ -71,7 +71,7 @@ select max(i) from t;
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_after_prepare";
+set debug_dbug="+d,crash_commit_after_prepare";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
 commit;
@@ -87,7 +87,7 @@ select max(i) from t;
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_after_log";
+set debug_dbug="+d,crash_commit_after_log";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
 commit;
@@ -103,7 +103,7 @@ select max(i) from t;
 begin;
 insert into t values ();
 insert into t values ();
-set debug="+d,crash_commit_after";
+set debug_dbug="+d,crash_commit_after";
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
 commit;