Post-merge fixes for rocksdb.add_index_inplace_crash

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

@@ -5,10 +5,10 @@ INSERT INTO t1 (a, b) VALUES (2, 6);
 INSERT INTO t1 (a, b) VALUES (3, 7);
 # crash_during_online_index_creation
 flush logs;
-SET SESSION debug="+d,crash_during_online_index_creation";
+SET SESSION debug_dbug="+d,crash_during_online_index_creation";
 ALTER TABLE t1 ADD INDEX kb(b), ALGORITHM=INPLACE;
 ERROR HY000: Lost connection to MySQL server during query
-SET SESSION debug="-d,crash_during_online_index_creation";
+SET SESSION debug_dbug="-d,crash_during_online_index_creation";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -24,14 +24,14 @@ DROP TABLE t1;
 CREATE TABLE t1 (i INT, j INT, k INT, PRIMARY KEY (i), KEY(j)) ENGINE = ROCKSDB PARTITION BY KEY(i) PARTITIONS 4;
 # crash_during_index_creation_partition
 flush logs;
-SET SESSION debug="+d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="+d,crash_during_index_creation_partition";
 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 ERROR HY000: Lost connection to MySQL server during query
-SET SESSION debug="-d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="-d,crash_during_index_creation_partition";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   `k` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
@@ -59,17 +59,17 @@ DROP TABLE t1;
 CREATE TABLE t1 (i INT, j INT, k INT, PRIMARY KEY (i), KEY(j)) ENGINE = ROCKSDB PARTITION BY KEY(i) PARTITIONS 4;
 # crash_during_index_creation_partition
 flush logs;
-SET SESSION debug="+d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="+d,myrocks_simulate_index_create_rollback";
 # expected assertion failure from sql layer here for alter rollback
 call mtr.add_suppression("Assertion `0' failed.");
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 ERROR HY000: Lost connection to MySQL server during query
-SET SESSION debug="-d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="-d,myrocks_simulate_index_create_rollback";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   `k` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),
@@ -81,7 +81,7 @@ ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL DEFAULT '0',
+  `i` int(11) NOT NULL,
   `j` int(11) DEFAULT NULL,
   `k` int(11) DEFAULT NULL,
   PRIMARY KEY (`i`),

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

 --source include/have_rocksdb.inc
 --source include/have_debug.inc
+--source include/have_partition.inc
 
 --disable_warnings
 drop table if exists t1;
@@ -18,14 +19,14 @@ INSERT INTO t1 (a, b) VALUES (3, 7);
 flush logs;
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_during_online_index_creation";
+SET SESSION debug_dbug="+d,crash_during_online_index_creation";
 --error 2013
 ALTER TABLE t1 ADD INDEX kb(b), ALGORITHM=INPLACE;
 
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-SET SESSION debug="-d,crash_during_online_index_creation";
+SET SESSION debug_dbug="-d,crash_during_online_index_creation";
 
 SHOW CREATE TABLE t1;
 CHECK TABLE t1;
@@ -51,14 +52,14 @@ while ($i <= $max) {
 flush logs;
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="+d,crash_during_index_creation_partition";
 --error 2013
 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-SET SESSION debug="-d,crash_during_index_creation_partition";
+SET SESSION debug_dbug="-d,crash_during_index_creation_partition";
 
 SHOW CREATE TABLE t1;
 
@@ -90,7 +91,7 @@ while ($i <= $max) {
 flush logs;
 
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-SET SESSION debug="+d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="+d,myrocks_simulate_index_create_rollback";
 
 --echo # expected assertion failure from sql layer here for alter rollback
 call mtr.add_suppression("Assertion `0' failed.");
@@ -103,7 +104,7 @@ ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE;
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 
-SET SESSION debug="-d,myrocks_simulate_index_create_rollback";
+SET SESSION debug_dbug="-d,myrocks_simulate_index_create_rollback";
 
 SHOW CREATE TABLE t1;