Merge 10.2 into 10.3

75e1b1a0 · Marko Mäkelä · fdef9f9b · 57421419 · 75e1b1a0
Commit 75e1b1a0 authored Jul 25, 2019 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

storage/rocksdb/mysql-test/rocksdb_rpl/combinations storage/rocksdb/mysql-test/rocksdb_rpl/combinations +0 -5

No files found.
--- a/storage/rocksdb/mysql-test/rocksdb_rpl/combinations
+++ b/storage/rocksdb/mysql-test/rocksdb_rpl/combinations
@@ -5,8 +5,3 @@ rocksdb_write_policy=write_committed
 [row-write-prepared]
 binlog-format=row
 rocksdb_write_policy=write_prepared
-[row-write-committed-slave-gtid-optimized]
-binlog-format=row
-rocksdb_write_policy=write_committed
-slave_gtid_info=optimized