MDEV-13404: MyRocks upstream uses I_S.table_statistics.row_lock_deadlocks

Comment out a part of testcase that uses it.

2 files changed, 15 insertions, 46 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/include/deadlock_stats.inc b/storage/rocksdb/mysql-test/rocksdb/include/deadlock_stats.inc
index 40df82e1314..48ef6f816bd 100644
--- a/storage/rocksdb/mysql-test/rocksdb/include/deadlock_stats.inc
+++ b/storage/rocksdb/mysql-test/rocksdb/include/deadlock_stats.inc
@@ -19,6 +19,11 @@ connection default;
 eval create table t (i int primary key) engine=$engine;
 insert into t values (1), (2), (3);
 
+--echo #
+--echo # The following is disabled due:
+--echo #   MDEV-13404: MyRocks upstream uses I_S.table_statistics.row_lock_deadlocks, should we import?
+--echo #
+--disable_parsing
 --source include/simple_deadlock.inc
 connection default;
 select row_lock_deadlocks from information_schema.table_statistics where
@@ -33,6 +38,7 @@ table_name = "t";
 
 select row_lock_deadlocks from information_schema.table_statistics where
 table_name = "t";
+--enable_parsing
 
 disconnect con1;
 disconnect con2;
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/deadlock_stats.result b/storage/rocksdb/mysql-test/rocksdb/r/deadlock_stats.result
index 9b62cade9ca..79cb6bb0f61 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/deadlock_stats.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/deadlock_stats.result
@@ -1,51 +1,14 @@
 set @prior_lock_wait_timeout = @@rocksdb_lock_wait_timeout; set @prior_deadlock_detect = @@rocksdb_deadlock_detect; set global rocksdb_deadlock_detect = on; set global rocksdb_lock_wait_timeout = 100000;;
+connect  con1,localhost,root,,;
+connect  con2,localhost,root,,;
+connection default;
 create table t (i int primary key) engine=rocksdb;
 insert into t values (1), (2), (3);
-begin;
-select * from t where i=1 for update;
-i
-1
-begin;
-select * from t where i=2 for update;
-i
-2
-select * from t where i=2 for update;
-select * from t where i=1 for update;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-rollback;
-i
-2
-rollback;
-select row_lock_deadlocks from information_schema.table_statistics where
-table_name = "t";
-row_lock_deadlocks
-1
-select row_lock_deadlocks from information_schema.table_statistics where
-table_name = "t";
-row_lock_deadlocks
-1
-begin;
-select * from t where i=1 for update;
-i
-1
-begin;
-select * from t where i=2 for update;
-i
-2
-select * from t where i=2 for update;
-select * from t where i=1 for update;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-rollback;
-i
-2
-rollback;
-select row_lock_deadlocks from information_schema.table_statistics where
-table_name = "t";
-row_lock_deadlocks
-2
-select row_lock_deadlocks from information_schema.table_statistics where
-table_name = "t";
-row_lock_deadlocks
-2
+#
+# The following is disabled due:
+#   MDEV-13404: MyRocks upstream uses I_S.table_statistics.row_lock_deadlocks, should we import?
+#
+disconnect con1;
+disconnect con2;
 set global rocksdb_lock_wait_timeout = @prior_lock_wait_timeout; set global rocksdb_deadlock_detect = @prior_deadlock_detect;;
 drop table t;