More fixes in MyRocks' rocksdb_rpl testsuite

- Make my.cnf to include rpl_1slave_base.cnf (needed for tests that
  actually use replication, i.e. need a functioning slave)
- Adjust and enable singledelete_idempotent_table.test
- More edits in disabled.def

storage/rocksdb/mysql-test/rocksdb_rpl/my.cnf

+!include rpl_1slave_base.cnf
 !include include/default_my.cnf
 
 [server]

storage/rocksdb/mysql-test/rocksdb_rpl/r/singledelete_idempotent_table.result

 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 r1;
 create table r1 (id1 int, id2 int, primary key (id1, id2), index i (id2)) engine=rocksdb;
 insert into r1 values (1, 1000);
 set sql_log_bin=0;
 delete from r1 where id1=1 and id2=1000;
 set sql_log_bin=1;
+connection slave;
+connection slave;
 set global rocksdb_force_flush_memtable_now=1;
+connection master;
 insert into r1 values (1, 1000);
+connection slave;
+connection slave;
 delete r1 from r1 force index (i) where id2=1000;
 select id1,id2 from r1 force index (primary);
 id1	id2
@@ -21,5 +24,6 @@ select id1,id2 from r1 force index (primary);
 id1	id2
 select id2 from r1 force index (i);
 id2
+connection master;
 drop table r1;
 include/rpl_end.inc

storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def

@@ -6,6 +6,15 @@ rpl_no_unique_check_on_lag :  unique_check_lag_threshold is not available in Mar
 rpl_no_unique_check_on_lag_mts : unique_check_lag_threshold is not available in MariaDB
 consistent_snapshot_mixed_engines : Tests START TRANSACTION WITH CONSISTENT $ENGINE_NAME SNAPSHOT
 rpl_skip_trx_api_binlog_format : requires @@rpl_skip_tx_api
+rpl_ddl_high_priority : DDL commands with HIGH_PRIORITY syntax are not in MariaDB
+rpl_gtid_rocksdb_sys_header : MariaDB doesn't support printing "RocksDB: Last MySQL Gtid UUID" into server stderr on startup
+
+
+##
+##  Tests that do not fit MariaDB's test environment (Functional tests only,
+##  can't have stress tests)
+##
+rpl_rocksdb_stress_crash : Stress test
 
 ##
 ## Tests that are disabled for other reasons 
@@ -13,13 +22,9 @@ rpl_skip_trx_api_binlog_format : requires @@rpl_skip_tx_api
 
 multiclient_2pc : Didn't try with MariaDB, yet
 rpl_crash_safe_wal_corrupt : Didn't try with MariaDB, yet
-rpl_ddl_high_priority : Didn't try with MariaDB, yet
 rpl_gtid_crash_safe : Didn't try with MariaDB, yet
 rpl_gtid_crash_safe_wal_corrupt : Didn't try with MariaDB, yet
-rpl_gtid_rocksdb_sys_header : Didn't try with MariaDB, yet
 rpl_rocksdb_snapshot : Didn't try with MariaDB, yet
 rpl_rocksdb_snapshot_without_gtid : Didn't try with MariaDB, yet
-rpl_rocksdb_stress_crash : Didn't try with MariaDB, yet
 singledelete_idempotent_recovery : Didn't try with MariaDB, yet
-singledelete_idempotent_table : Didn't try with MariaDB, yet
 

storage/rocksdb/mysql-test/rocksdb_rpl/t/singledelete_idempotent_table.cnf

@@ -2,14 +2,10 @@
 
 [mysqld.1]
 log_slave_updates
-gtid_mode=ON
-enforce_gtid_consistency=ON
 
 [mysqld.2]
 relay_log_recovery=1
-relay_log_info_repository=FILE
+#relay_log_info_repository=FILE
 log_slave_updates
-gtid_mode=ON
-enforce_gtid_consistency=ON
-rbr_idempotent_tables='r1'
-
+#rbr_idempotent_tables='r1'
+slave_exec_mode=IDEMPOTENT

storage/rocksdb/mysql-test/rocksdb_rpl/t/singledelete_idempotent_table.test

@@ -2,7 +2,7 @@
 --source include/have_binlog_format_row.inc
 --source include/have_rocksdb.inc
 --source include/master-slave.inc
---source include/have_gtid.inc
+#--source include/have_gtid.inc
 --source include/not_valgrind.inc
 
 # This is a test case for issue#655 -- SingleDelete on Primary Key may