Commit 1e6b02e6 authored by Sergei Petrunia's avatar Sergei Petrunia

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

Comment out a part of testcase that uses it.
parent c90753e6
...@@ -19,6 +19,11 @@ connection default; ...@@ -19,6 +19,11 @@ connection default;
eval create table t (i int primary key) engine=$engine; eval create table t (i int primary key) engine=$engine;
insert into t values (1), (2), (3); 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 --source include/simple_deadlock.inc
connection default; connection default;
select row_lock_deadlocks from information_schema.table_statistics where select row_lock_deadlocks from information_schema.table_statistics where
...@@ -33,6 +38,7 @@ table_name = "t"; ...@@ -33,6 +38,7 @@ table_name = "t";
select row_lock_deadlocks from information_schema.table_statistics where select row_lock_deadlocks from information_schema.table_statistics where
table_name = "t"; table_name = "t";
--enable_parsing
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;
......
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;; 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; create table t (i int primary key) engine=rocksdb;
insert into t values (1), (2), (3); insert into t values (1), (2), (3);
begin; #
select * from t where i=1 for update; # The following is disabled due:
i # MDEV-13404: MyRocks upstream uses I_S.table_statistics.row_lock_deadlocks, should we import?
1 #
begin; disconnect con1;
select * from t where i=2 for update; disconnect con2;
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
set global rocksdb_lock_wait_timeout = @prior_lock_wait_timeout; set global rocksdb_deadlock_detect = @prior_deadlock_detect;; set global rocksdb_lock_wait_timeout = @prior_lock_wait_timeout; set global rocksdb_deadlock_detect = @prior_deadlock_detect;;
drop table t; drop table t;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment