revision-id: b97920e3918b5163fb15c09a366109bbe120bb1c () parent(s): 90c4f22ad136cfb17dcdf6d6f78e8b5b3fc3c6f5 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-03-25 20:21:15 +0300 message: Update tests after rebasing over 8.0.20 --- .../suite/rocksdb/include/select_from_is_rowlocks.inc | 15 +++++++++++++-- .../rocksdb/r/level_repeatable_read-range_locking.result | 2 +- mysql-test/suite/rocksdb/r/range_locking.result | 2 +- .../suite/rocksdb/r/range_locking_escalation.result | 2 +- mysql-test/suite/rocksdb/r/range_locking_rev_cf.result | 2 +- .../suite/rocksdb/r/range_locking_shared_locks.result | 2 +- mysql-test/suite/rocksdb/t/range_locking_escalation.test | 1 + 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc index e5f54d68914..6dbd63c87c4 100644 --- a/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc +++ b/mysql-test/suite/rocksdb/include/select_from_is_rowlocks.inc @@ -17,10 +17,21 @@ set @cf_id=(select column_family from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); set @rtrx_id=(select transaction_id from information_schema.rocksdb_trx where thread_id=connection_id()); -set @indexnr= (select lower(lpad(hex(index_number),8,'0')) from information_schema.rocksdb_ddl +set @indexnr= (select lower( + concat( + lpad(hex(db_number),8,'0'), + lpad(hex(index_number),8,'0') + ) + ) + from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); -set @indexnr_next= (select lower(lpad(hex(index_number+1),8,'0')) +set @indexnr_next= (select lower( + concat( + lpad(hex(db_number),8,'0'), + lpad(hex(index_number+1),8,'0') + ) + ) from information_schema.rocksdb_ddl where table_name='t1' and index_name='PRIMARY'); diff --git a/mysql-test/suite/rocksdb/r/level_repeatable_read-range_locking.result b/mysql-test/suite/rocksdb/r/level_repeatable_read-range_locking.result index 37dc45a17f4..0592b099238 100644 --- a/mysql-test/suite/rocksdb/r/level_repeatable_read-range_locking.result +++ b/mysql-test/suite/rocksdb/r/level_repeatable_read-range_locking.result @@ -64,7 +64,7 @@ SELECT a from t2; a 1 INSERT INTO t2 (a) VALUES (1), (3); -ERROR 23000: Duplicate entry '1' for key 'PRIMARY' +ERROR 23000: Duplicate entry '1' for key 't2.PRIMARY' connection con2; INSERT INTO t2 (a) VALUES (2); COMMIT; diff --git a/mysql-test/suite/rocksdb/r/range_locking.result b/mysql-test/suite/rocksdb/r/range_locking.result index fc4a4c53e8a..603c0b99f09 100644 --- a/mysql-test/suite/rocksdb/r/range_locking.result +++ b/mysql-test/suite/rocksdb/r/range_locking.result @@ -64,7 +64,7 @@ insert into t2 values (1,1),(2,2); begin; insert into t2 values (3,3); insert into t2 values (10,2); -ERROR 23000: Duplicate entry '2' for key 'a' +ERROR 23000: Duplicate entry '2' for key 't2.a' connection con2; begin; select * from t2 where pk=3 for update; diff --git a/mysql-test/suite/rocksdb/r/range_locking_escalation.result b/mysql-test/suite/rocksdb/r/range_locking_escalation.result index ae4c01cad72..698b0f4a02f 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_escalation.result +++ b/mysql-test/suite/rocksdb/r/range_locking_escalation.result @@ -23,5 +23,5 @@ count(*) 10000 show status like 'rocksdb_locktree_escalation_count'; Variable_name Value -rocksdb_locktree_escalation_count 3321 +rocksdb_locktree_escalation_count 128 drop table t0,t1; diff --git a/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result b/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result index 883cb88ec79..5e1c2cf98a5 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result +++ b/mysql-test/suite/rocksdb/r/range_locking_rev_cf.result @@ -64,7 +64,7 @@ insert into t2 values (1,1),(2,2); begin; insert into t2 values (3,3); insert into t2 values (10,2); -ERROR 23000: Duplicate entry '2' for key 'a' +ERROR 23000: Duplicate entry '2' for key 't2.a' connection con2; begin; select * from t2 where pk=3 for update; diff --git a/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result b/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result index 580108de6f6..90223043c08 100644 --- a/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result +++ b/mysql-test/suite/rocksdb/r/range_locking_shared_locks.result @@ -208,7 +208,7 @@ $cf_id $TRX2_ID ${indexnr}800009ce S connection default; show status like 'rocksdb_locktree_current_lock_memory'; Variable_name Value -rocksdb_locktree_current_lock_memory 8792 +rocksdb_locktree_current_lock_memory 9016 set @save_mlm= @@rocksdb_max_lock_memory; # Set the limit to cause lock escalation: set @cur_mem_usage= (select diff --git a/mysql-test/suite/rocksdb/t/range_locking_escalation.test b/mysql-test/suite/rocksdb/t/range_locking_escalation.test index cd4f8a30a46..5a6e9fa6616 100644 --- a/mysql-test/suite/rocksdb/t/range_locking_escalation.test +++ b/mysql-test/suite/rocksdb/t/range_locking_escalation.test @@ -3,6 +3,7 @@ # --source include/have_rocksdb.inc +--source suite/rocksdb/include/have_range_locking.inc --enable_connect_log