MyRocks: Post-merge testcase fixes part #1

7 years ago · a01823a33f
3 changed files with 5 additions and 4 deletions
--- a/storage/rocksdb/mysql-test/rocksdb/combinations
+++ b/storage/rocksdb/mysql-test/rocksdb/combinations
@ -1,6 +1,6 @@
 [write_committed]
-rocksdb_write_policy=write_committed
+loose-rocksdb_write_policy=write_committed

 [write_prepared]
-rocksdb_write_policy=write_prepared
-rocksdb_commit_time_batch_for_recovery=on
+loose-rocksdb_write_policy=write_prepared
+loose-rocksdb_commit_time_batch_for_recovery=on
--- a/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result
@ -19,7 +19,7 @@ SELECT * FROM t1;
 id	value
 1	1
 INSERT INTO t1 values (2, 2);
-ERROR HY000: Can't execute updates when you started a transaction with START TRANSACTION WITH CONSISTENT|SHARED|EXISTING [ROCKSDB] SNAPSHOT.
+ERROR HY000: Can't execute updates when you started a transaction with START TRANSACTION WITH CONSISTENT [ROCKSDB] SNAPSHOT.
 ROLLBACK;
 SELECT * FROM t1;
 id	value
--- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
+++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
@ -21,6 +21,7 @@ mysqldump2 : MariaDB's mysqldump doesn't support --print-ordering-key
 native_procedure : Not supported in MariaDB
 slow_query_log: MDEV-11480
 select_for_update_skip_locked_nowait: MDEV-11481
+create_no_primary_key_table: MariaDB doesn't have --block_create_no_primary_key


 ##