summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.(none)>2007-06-07 19:20:49 +0200
committerunknown <msvensson@pilot.(none)>2007-06-07 19:20:49 +0200
commitc01c90474935d172ae6807b55d1836180a4ddc75 (patch)
treea2a403970344be1ed9b1610ef677dd9af202bfba /mysql-test/include
parente8116aebdfd3bd5bf78f10eadfaea930fd350980 (diff)
downloadmariadb-git-c01c90474935d172ae6807b55d1836180a4ddc75.tar.gz
Bug#28369 rpl test cases fail with binlog disabled
- Additional tests in 5.1 that need binlog - Mark more test to need binlog mysql-test/include/have_binlog_format_mixed.inc: Need binlog mysql-test/include/have_binlog_format_mixed_or_row.inc: Need binlog mysql-test/include/have_binlog_format_row.inc: Need binlog mysql-test/include/have_binlog_format_statement.inc: Need binlog mysql-test/r/date_formats.result: Show only the variables affected by the testcase to avoid it fails when running without binlog mysql-test/t/date_formats.test: Show only the variables affected by the testcase to avoid it fails when running without binlog mysql-test/t/ndb_binlog_basic2.test: Need binlog mysql-test/t/ps.test: Need binlog mysql-test/t/rpl_sf.test: Nedd binlog
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/have_binlog_format_mixed.inc2
-rw-r--r--mysql-test/include/have_binlog_format_mixed_or_row.inc2
-rw-r--r--mysql-test/include/have_binlog_format_row.inc2
-rw-r--r--mysql-test/include/have_binlog_format_statement.inc2
4 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/include/have_binlog_format_mixed.inc b/mysql-test/include/have_binlog_format_mixed.inc
index fc5ca61c5a0..fc1dc8324c6 100644
--- a/mysql-test/include/have_binlog_format_mixed.inc
+++ b/mysql-test/include/have_binlog_format_mixed.inc
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
-- require r/have_binlog_format_mixed.require
disable_query_log;
show variables like "binlog_format";
diff --git a/mysql-test/include/have_binlog_format_mixed_or_row.inc b/mysql-test/include/have_binlog_format_mixed_or_row.inc
index c38b8f3d601..fcba9eef883 100644
--- a/mysql-test/include/have_binlog_format_mixed_or_row.inc
+++ b/mysql-test/include/have_binlog_format_mixed_or_row.inc
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
--require r/have_binlog_format_row.require
--disable_query_log
--replace_result MIXED ROW
diff --git a/mysql-test/include/have_binlog_format_row.inc b/mysql-test/include/have_binlog_format_row.inc
index 2992b8e0f32..f24bca52b5a 100644
--- a/mysql-test/include/have_binlog_format_row.inc
+++ b/mysql-test/include/have_binlog_format_row.inc
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
-- require r/have_binlog_format_row.require
disable_query_log;
show variables like "binlog_format";
diff --git a/mysql-test/include/have_binlog_format_statement.inc b/mysql-test/include/have_binlog_format_statement.inc
index c99297c10e5..ca863293d1d 100644
--- a/mysql-test/include/have_binlog_format_statement.inc
+++ b/mysql-test/include/have_binlog_format_statement.inc
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
-- require r/have_binlog_format_statement.require
disable_query_log;
show variables like "binlog_format";