revision-id: 138605c3b715f15c74a9350320e2ccc5ea2c0e38 parent(s): f561e63fdd901a07d89417e45f6f7db2585ba13f committer: Sergei Petrunia branch nick: 10.2-mariarocks-merge timestamp: 2018-08-28 16:30:22 +0300 message: MyRocks: Post-merge testcase fixes part #3 --- storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result | 4 ++-- storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result | 2 +- .../mysql-test/rocksdb/r/secondary_key_update_lock.result | 9 ++++++++- storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result | 2 +- .../rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result index 058d360..4f6702b 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter5.result @@ -27,7 +27,7 @@ set global rocksdb_force_flush_memtable_now=1; explain select * from t1 limit 10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 10000 NULL +1 SIMPLE t1 ALL NULL NULL NULL NULL 10000 select * from t1 limit 10; id1 id2 id3 id4 id5 value value2 1000 2000 2000 10000 10000 1000 aaabbbccc @@ -44,7 +44,7 @@ id1 id2 id3 id4 id5 value value2 explain select * from t1 order by id1 desc,id2 desc, id3 desc, id4 desc limit 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index NULL PRIMARY 122 NULL 1 NULL +1 SIMPLE t1 index NULL PRIMARY 122 NULL 1 select * from t1 order by id1 desc,id2 desc, id3 desc, id4 desc limit 1; id1 id2 id3 id4 id5 value value2 1000 2000 2000 10000 10000 1000 aaabbbccc diff --git a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result index 0619e2d..3ec9294 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result @@ -14,7 +14,7 @@ show create table information_schema.rocksdb_deadlock; Table Create Table ROCKSDB_DEADLOCK CREATE TEMPORARY TABLE `ROCKSDB_DEADLOCK` ( `DEADLOCK_ID` bigint(8) NOT NULL DEFAULT 0, - `TIMESTAMP` bigint(8) NOT NULL DEFAULT '0', + `TIMESTAMP` bigint(8) NOT NULL DEFAULT 0, `TRANSACTION_ID` bigint(8) NOT NULL DEFAULT 0, `CF_NAME` varchar(193) NOT NULL DEFAULT '', `WAITING_KEY` varchar(513) NOT NULL DEFAULT '', diff --git a/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result b/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result index 1d7a519..1421782 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/secondary_key_update_lock.result @@ -1,11 +1,18 @@ +connect con, localhost, root,,; +connection default; create table t1 (a int primary key, b int unique key) engine = rocksdb; insert into t1 values(1, 1); +connection con; begin; update t1 set b = 2 where b = 1; +connection default; insert into t1 values(2, 1); -ERROR HY000: Lock wait timeout exceeded; try restarting transaction: Timeout on index: test.t1.b +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +connection con; rollback; select * from t1; a b 1 1 +connection default; drop table t1; +disconnect con; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result index 45a21c3..8a4ee14 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_reads.result @@ -3,7 +3,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY DEFAULT '0', a INT(11), b CHAR(8)) ENGINE=ro SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `pk` int(11) NOT NULL DEFAULT '0', + `pk` int(11) NOT NULL DEFAULT 0, `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) diff --git a/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test b/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test index 5ca8e0b..46ea7f0 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/insert_optimized_config.test @@ -1,5 +1,5 @@ --source include/have_rocksdb.inc ---source suite/rocksdb/include/have_write_committed.inc +--source include/have_write_committed.inc --disable_warnings DROP TABLE IF EXISTS t1;