MariaRocks port: make rocksdb.rpl_statement_not_found work

Author: spetrunia

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

@@ -1,7 +1,4 @@
 include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 connection master;
 drop table if exists t1;
@@ -17,19 +14,22 @@ kp2 int,
 col1 int,
 key (kp1,kp2)
 ) engine=rocksdb;
+set @tmp_binlog_format=@@binlog_format;
+set @@binlog_format=ROW;
 insert into t2 select a,a,a,a from t1;
 create table t3 like t2;
 insert into t3 select * from t2;
+set binlog_format=@tmp_binlog_format;
 include/sync_slave_sql_with_master.inc
 connection slave;
-set global debug= 'd,dbug.rocksdb.get_row_by_rowid';
+set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid';
 include/stop_slave.inc
 include/start_slave.inc
 connection master;
 update t2 set col1=100 where kp1 between 1 and 3 and mod(kp2,2)=0;
 connection slave;
 set debug_sync= 'now WAIT_FOR Reached';
-set global debug = '';
+set global debug_dbug = '';
 set sql_log_bin=0;
 delete from t2 where pk=2;
 delete from t2 where pk=3;
@@ -43,15 +43,15 @@ pk	kp1	kp2	col1
 1	1	1	1
 4	4	4	4
 connection slave;
-set global debug= 'd,dbug.rocksdb.get_row_by_rowid';
+set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid';
 include/stop_slave.inc
 include/start_slave.inc
 connection master;
 update t3 set col1=100 where kp1 between 1 and 4 and mod(kp2,2)=0;
 connection slave;
 call mtr.add_suppression("Deadlock found when trying to get lock");
 set debug_sync= 'now WAIT_FOR Reached';
-set global debug = '';
+set global debug_dbug = '';
 set sql_log_bin=0;
 delete from t3 where pk=2;
 delete from t3 where pk=3;
@@ -64,5 +64,7 @@ pk	kp1	kp2	col1
 0	0	0	0
 1	1	1	1
 4	4	4	100
+set debug_sync='RESET';
+connection master;
 drop table t0, t1, t2, t3;
 include/rpl_end.inc

storage/rocksdb/mysql-test/rocksdb/t/rpl_row_not_found.inc

@@ -21,9 +21,14 @@ create table t2 (
   col1 int,
   key (kp1,kp2)
 ) engine=rocksdb;
+# Use RBR for next few statements to avoid the 
+#  'Unsafe statement written to the binary log' warnings.
+set @tmp_binlog_format=@@binlog_format;
+set @@binlog_format=ROW;
 insert into t2 select a,a,a,a from t1;
 create table t3 like t2;
 insert into t3 select * from t2;
+set binlog_format=@tmp_binlog_format;
 
 
 # For GitHub issue#166
@@ -41,7 +46,7 @@ insert into t3 select * from t2;
 
 connection slave;
 let $old_debug = `select @@global.debug`;
-set global debug= 'd,dbug.rocksdb.get_row_by_rowid';
+set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid';
 --source include/stop_slave.inc
 --source include/start_slave.inc
 
@@ -50,7 +55,7 @@ update t2 set col1=100 where kp1 between 1 and 3 and mod(kp2,2)=0;
 
 connection slave;
 set debug_sync= 'now WAIT_FOR Reached';
-eval set global debug = '$old_debug';
+eval set global debug_dbug = '$old_debug';
 set sql_log_bin=0;
 delete from t2 where pk=2;
 delete from t2 where pk=3;
@@ -63,7 +68,7 @@ select * from t2 where pk < 5;
 
 # For GitHub issue#162 (result file must be updated after fixing #162)
 connection slave;
-set global debug= 'd,dbug.rocksdb.get_row_by_rowid';
+set global debug_dbug= 'd,dbug.rocksdb.get_row_by_rowid';
 --source include/stop_slave.inc
 --source include/start_slave.inc
 
@@ -73,7 +78,7 @@ update t3 set col1=100 where kp1 between 1 and 4 and mod(kp2,2)=0;
 connection slave;
 call mtr.add_suppression("Deadlock found when trying to get lock");
 set debug_sync= 'now WAIT_FOR Reached';
-eval set global debug = '$old_debug';
+eval set global debug_dbug = '$old_debug';
 set sql_log_bin=0;
 delete from t3 where pk=2;
 delete from t3 where pk=3;
@@ -85,6 +90,7 @@ connection slave;
 # col1 for pk=4 should be 100
 select * from t3 where pk < 5;
 
+set debug_sync='RESET';
 # Cleanup
 connection master;
 drop table t0, t1, t2, t3;

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

@@ -1,2 +1,3 @@
+--source include/have_binlog_format_statement.inc
 --source rpl_row_not_found.inc