summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2018-09-03 12:19:16 +0300
committerSergei Petrunia <psergey@askmonty.org>2018-09-03 12:19:16 +0300
commit2676f3371cc18cf9f33b24accf3949a590c1fec8 (patch)
tree0eadb1b648db63adab1ec1457dcfaf8dc6fdbb1f /storage
parent08d0a2a8cf42c26f6e03952197aa46c738b7d852 (diff)
downloadmariadb-git-2676f3371cc18cf9f33b24accf3949a590c1fec8.tar.gz
Post-merge fixes: Disable rpl_mts_dependency_unique_key_conflicts test
It uses --slave-use-idempotent-for-recovery which is not available in MariaDB.
Diffstat (limited to 'storage')
-rw-r--r--storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def
index 1e8c0df0564..3896a822872 100644
--- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def
+++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def
@@ -9,6 +9,7 @@ rpl_skip_trx_api_binlog_format : requires @@rpl_skip_tx_api
rpl_ddl_high_priority : DDL commands with HIGH_PRIORITY syntax are not in MariaDB
rpl_gtid_rocksdb_sys_header : MariaDB doesn't support printing "RocksDB: Last MySQL Gtid UUID" into server stderr on startup
singledelete_idempotent_recovery: MariaDB doesn't support --slave-use-idempotent-for-recovery
+rpl_mts_dependency_unique_key_conflicts: MariaDB doesn't support --slave-use-idempotent-for-recovery
rpl_missing_columns_sk_update : Uses log_column_names=ON feature which is only present in FB/MySQL
##