revision-id: 3d2c0f61e71adb80b914e9b87e57be90cb881def parent(s): 138605c3b715f15c74a9350320e2ccc5ea2c0e38 committer: Sergei Petrunia branch nick: 10.2-mariarocks-merge timestamp: 2018-08-28 17:35:52 +0300 message: MyRocks: Post-merge testcase fixes part #4 --- .../rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result | 1 + storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result | 8 ++++---- .../mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result | 13 ++++++++++--- storage/rocksdb/rdb_i_s.cc | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result index aab6e82..df27fbe 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result @@ -78,6 +78,7 @@ ROCKSDB_CF_OPTIONS Stable ROCKSDB_COMPACTION_STATS Stable ROCKSDB_GLOBAL_INFO Stable ROCKSDB_DDL Stable +ROCKSDB_SST_PROPS Stable ROCKSDB_INDEX_FILE_MAP Stable ROCKSDB_LOCKS Stable ROCKSDB_TRX Stable diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result index c6e15dc..2044310 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result @@ -1503,8 +1503,8 @@ Rocksdb_block_cache_index_miss # Rocksdb_block_cache_miss # Rocksdb_block_cachecompressed_hit # Rocksdb_block_cachecompressed_miss # -rocksdb_bloom_filter_full_positive # -rocksdb_bloom_filter_full_true_positive # +Rocksdb_bloom_filter_full_positive # +Rocksdb_bloom_filter_full_true_positive # Rocksdb_bloom_filter_prefix_checked # Rocksdb_bloom_filter_prefix_useful # Rocksdb_bloom_filter_useful # @@ -1521,12 +1521,12 @@ Rocksdb_get_hit_l1 # Rocksdb_get_hit_l2_and_up # Rocksdb_getupdatessince_calls # Rocksdb_iter_bytes_read # +Rocksdb_manual_compactions_processed # +Rocksdb_manual_compactions_running # Rocksdb_memtable_hit # Rocksdb_memtable_miss # Rocksdb_no_file_closes # Rocksdb_no_file_errors # -rocksdb_manual_compactions_processed # -rocksdb_manual_compactions_running # Rocksdb_no_file_opens # Rocksdb_num_iterators # Rocksdb_number_block_not_compressed # diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result index ca1ad57..ea25069 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_deadlock_detect_rr.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/rdb_i_s.cc b/storage/rocksdb/rdb_i_s.cc index 9192795..36c9493 100644 --- a/storage/rocksdb/rdb_i_s.cc +++ b/storage/rocksdb/rdb_i_s.cc @@ -1906,7 +1906,7 @@ struct st_maria_plugin rdb_i_s_ddl = { nullptr, /* status variables */ nullptr, /* system variables */ nullptr, /* config options */ - 0, /* flags */ + MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL }; struct st_mysql_plugin rdb_i_s_sst_props = {