Post-merge fixes: make rocksdb.allow_to_start_after_corruption pass

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

@@ -12,9 +12,10 @@ insert into t1 values (1,1),(2,2),(3,3);
 select * from t1 where pk=1;
 pk	col1
 1	1
-set session debug= "+d,rocksdb_return_status_corrupted";
+set session debug_dbug= "+d,rocksdb_return_status_corrupted";
 select * from t1 where pk=1;
 ERROR HY000: Lost connection to MySQL server during query
+FOUND 1 /data corruption detected/ in allow_to_start_after_corruption_debug.err
 #
 #  The same for scan queries
 #
@@ -23,12 +24,14 @@ pk	col1
 1	1
 2	2
 3	3
-set session debug= "+d,rocksdb_return_status_corrupted";
+set session debug_dbug= "+d,rocksdb_return_status_corrupted";
 select * from t1;
 ERROR HY000: Lost connection to MySQL server during query
+FOUND 1 /data corruption detected/ in allow_to_start_after_corruption_debug.err
 #
 #  Test restart failure. The server is shutdown at this point.
 #
+FOUND 1 /The server will exit normally and stop restart attempts/ in allow_to_start_after_corruption_debug.err
 #
 #  Remove corruption file and restart cleanly
 #

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

@@ -26,7 +26,7 @@ create table t1 (
 insert into t1 values (1,1),(2,2),(3,3);
 
 select * from t1 where pk=1;
-set session debug= "+d,rocksdb_return_status_corrupted";
+set session debug_dbug= "+d,rocksdb_return_status_corrupted";
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 --error 2013
 select * from t1 where pk=1;
@@ -41,7 +41,7 @@ select * from t1 where pk=1;
 
 --source include/start_mysqld_with_option.inc
 select * from t1;
-set session debug= "+d,rocksdb_return_status_corrupted";
+set session debug_dbug= "+d,rocksdb_return_status_corrupted";
 --exec echo "wait" > $_expect_file_name
 --error 2013
 select * from t1;
@@ -57,7 +57,7 @@ select * from t1;
 # remove flag to ignore corruption
 --let $_mysqld_option=--log-error=$LOG
 --error 0
---exec $MYSQLD_CMD $_mysqld_option
+--exec $MYSQLD_CMD --plugin_load=$HA_ROCKSDB_SO $_mysqld_option
 --let SEARCH_PATTERN=The server will exit normally and stop restart attempts
 --source include/search_pattern_in_file.inc
 --remove_file $LOG
@@ -66,7 +66,7 @@ select * from t1;
 --echo #  Remove corruption file and restart cleanly
 --echo #
 
---exec rm $MYSQLTEST_VARDIR/mysqld.$_server_id/data/.rocksdb/ROCKSDB_CORRUPTED
+--exec rm $MYSQLTEST_VARDIR/mysqld.$_server_id/data/#rocksdb/ROCKSDB_CORRUPTED
 --source include/start_mysqld_with_option.inc
 
 drop table t1;