From 0b6066d021170117364ee3ff898948991d57fc41 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 24 May 2022 14:32:51 +0200 Subject: [PATCH] binlog_combinations.inc -> binlog_format_combinations.inc --- mysql-test/include/binlog_combinations.inc | 5 ----- ....combinations => binlog_format_combinations.combinations} | 0 mysql-test/include/binlog_format_combinations.inc | 5 +++++ mysql-test/suite/atomic/alter_partition.test | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 mysql-test/include/binlog_combinations.inc rename mysql-test/include/{binlog_combinations.combinations => binlog_format_combinations.combinations} (100%) create mode 100644 mysql-test/include/binlog_format_combinations.inc diff --git a/mysql-test/include/binlog_combinations.inc b/mysql-test/include/binlog_combinations.inc deleted file mode 100644 index 2ddd787681a..00000000000 --- a/mysql-test/include/binlog_combinations.inc +++ /dev/null @@ -1,5 +0,0 @@ -# The goal of including this file is to test with different -# binlog combinations: row, stmt or mix -# (see include/binlog_combinations.combinations) - ---source include/have_log_bin.inc diff --git a/mysql-test/include/binlog_combinations.combinations b/mysql-test/include/binlog_format_combinations.combinations similarity index 100% rename from mysql-test/include/binlog_combinations.combinations rename to mysql-test/include/binlog_format_combinations.combinations diff --git a/mysql-test/include/binlog_format_combinations.inc b/mysql-test/include/binlog_format_combinations.inc new file mode 100644 index 00000000000..68ea4eee07c --- /dev/null +++ b/mysql-test/include/binlog_format_combinations.inc @@ -0,0 +1,5 @@ +# The goal of including this file is to test with different +# binlog format combinations: row, stmt or mix +# (see include/binlog_format_combinations.combinations) + +--source include/have_log_bin.inc diff --git a/mysql-test/suite/atomic/alter_partition.test b/mysql-test/suite/atomic/alter_partition.test index 23b996cf5a1..ff4635d3c53 100644 --- a/mysql-test/suite/atomic/alter_partition.test +++ b/mysql-test/suite/atomic/alter_partition.test @@ -1,7 +1,7 @@ --source include/have_partition.inc --source include/have_debug.inc --source include/have_sequence.inc ---source include/binlog_combinations.inc +--source include/binlog_format_combinations.inc --source include/have_binlog_format_row_or_statement.inc --source include/not_valgrind.inc