1 files changed, 4 insertions, 35 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe.test
index f1b1b16704f..5a3e665a025 100644
--- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe.test
+++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_gtid_crash_safe.test
@@ -4,39 +4,8 @@
 -- source include/have_debug.inc
 -- source include/not_valgrind.inc
 
--- let $engine = ROCKSDB
+if (`select count(*) = 1 from information_schema.global_variables where variable_name = 'slave_gtid_info' and variable_value = 'optimized';`) {
+  --skip Test does not support row_write_committed_slave_gtid_optimized policy due to subtle behavioral differences. rpl_gtid_crash_safe_optimized covers slave_gtid_info=optimized.
+}
 
-call mtr.add_suppression("Recovery from master pos");
-
--- let $debug_option = crash_before_update_pos
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_reset.inc
--- let $debug_option = crash_after_update_pos_before_apply
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_reset.inc
--- let $debug_option = crash_before_writing_xid
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_reset.inc
--- let $debug_option = half_binlogged_transaction
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_reset.inc
--- let $debug_option = crash_commit_before
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_reset.inc
--- let $debug_option = crash_commit_after_log
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_reset.inc
--- let $debug_option = crash_commit_after_prepare
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_reset.inc
--- let $debug_option = crash_commit_after
--- source extra/rpl_tests/rpl_gtid_crash_safe.inc
-
--- source include/rpl_end.inc
+-- source ../include/rpl_gtid_crash_safe.inc