MyRocks: Post-merge testcase fixes part #2

4 files changed, 20 insertions, 5 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result b/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result
index 2695f0b6953..4d20242f43e 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/drop_table.result
@@ -47,15 +47,23 @@ DELETE FROM t1;
 DELETE FROM t4;
 SET GLOBAL rocksdb_max_manual_compactions = 2;
 SET GLOBAL rocksdb_debug_manual_compaction_delay = 3600;
+connect  con1, localhost, root,,;
+connect  con2, localhost, root,,;
+connect  con3, localhost, root,,;
+connection con1;
 SET GLOBAL rocksdb_compact_cf='cf1';
+connection con2;
 SET GLOBAL rocksdb_compact_cf='rev:cf2';
+connection default;
 select * from information_schema.global_status where variable_name='rocksdb_manual_compactions_running';
 VARIABLE_NAME	VARIABLE_VALUE
 ROCKSDB_MANUAL_COMPACTIONS_RUNNING	1
+connection con3;
 SET GLOBAL rocksdb_compact_cf='cf1';
 ERROR HY000: Internal error: Can't schedule more manual compactions. Increase rocksdb_max_manual_compactions or stop issuing more manual compactions.
 SET GLOBAL rocksdb_compact_cf='rev:cf2';
 ERROR HY000: Internal error: Can't schedule more manual compactions. Increase rocksdb_max_manual_compactions or stop issuing more manual compactions.
+connection default;
 drop table t4;
 CREATE TABLE t5 (
 a int not null,
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result
index ca1ad5711ad..ea2506941b2 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rc.result
@@ -61,22 +61,29 @@ connection con1;
 i
 rollback;
 connection default;
-disconnect con1;
-disconnect con2;
-disconnect con3;
 create table t1 (id int primary key, value int, value2 int, index(value)) engine=rocksdb;
 insert into t1 values (1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);
+connection con1;
 begin;
 update t1 force index (value) set value2=value2+1 where value=3;
+connection con2;
 begin;
 update t1 force index (value) set value2=value2+1 where value=2;
 update t1 force index (value) set value2=value2+1 where value=4;
+connection con1;
 update t1 force index (value) set value2=value2+1 where value=4;
+connection con2;
 update t1 force index (value) set value2=value2+1 where value=3;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection con1;
 rollback;
+connection con2;
 rollback;
 drop table t1;
+connection default;
+disconnect con1;
+disconnect con2;
+disconnect con3;
 set global rocksdb_lock_wait_timeout = @prior_rocksdb_lock_wait_timeout;
 set global rocksdb_deadlock_detect = @prior_rocksdb_deadlock_detect;
 drop table t,r1,r2;
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
index 0498c9a5259..23c9c5d4120 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
+++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
@@ -22,7 +22,7 @@ native_procedure : Not supported in MariaDB
 slow_query_log: MDEV-11480
 select_for_update_skip_locked_nowait: MDEV-11481
 create_no_primary_key_table: MariaDB doesn't have --block_create_no_primary_key
-
+explicit_snapshot: MariaDB doesn't support Shared/Explicit snapshots
 
 ##
 ##  Tests that do not fit MariaDB's test environment. Upstream seems to test
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test
index f4fdaa7fc23..13f1bd68a72 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test
@@ -1,6 +1,6 @@
 --source include/have_rocksdb.inc
 --source include/have_partition.inc
---source suite/rocksdb/include/have_write_committed.inc
+--source include/have_write_committed.inc
 
 #
 # RocksDB Storage Engine tests