diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-08-28 12:43:00 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-08-28 12:43:00 +0000 |
| commit | a01823a33f93546f4990692979a4d5110b4d283d (patch) | |
| tree | 62c211878361e888405b7c5f30c74dc3bd5f54d3 | |
| parent | c930afd47eb68aaa5a6a1000969cef881d3fbb0b (diff) | |
| download | mariadb-git-a01823a33f93546f4990692979a4d5110b4d283d.tar.gz | |
MyRocks: Post-merge testcase fixes part #1
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/combinations | 6 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result | 2 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/combinations b/storage/rocksdb/mysql-test/rocksdb/combinations index c3f6b9d0396..d49de3d38b3 100644 --- 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 diff --git a/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result b/storage/rocksdb/mysql-test/rocksdb/r/read_only_tx.result index 2217bf1ca9f..db21c3c01d4 100644 --- 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 diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index 60f658ec7e1..0498c9a5259 100644 --- 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 ## |