summaryrefslogtreecommitdiff
path: root/mysql-test/t/date_formats.test
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/t/date_formats.test
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/t/date_formats.test')
-rw-r--r--mysql-test/t/date_formats.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test
index fe39cd95753..abf09942d1c 100644
--- a/mysql-test/t/date_formats.test
+++ b/mysql-test/t/date_formats.test
@@ -7,9 +7,9 @@ drop table if exists t1;
--enable_warnings
--replace_result ROW <format> STATEMENT <format> MIXED <format>
-SHOW GLOBAL VARIABLES LIKE "%_format%";
+SHOW GLOBAL VARIABLES LIKE "%e_format";
--replace_result ROW <format> STATEMENT <format> MIXED <format>
-SHOW SESSION VARIABLES LIKE "%_format%";
+SHOW SESSION VARIABLES LIKE "%e_format";
#
# Test setting a lot of different formats to see which formats are accepted and
@@ -37,7 +37,7 @@ set datetime_format= '%h:%i:%s %p %Y-%m-%d';
set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
--replace_result ROW <format> STATEMENT <format> MIXED <format>
-SHOW SESSION VARIABLES LIKE "%format";
+SHOW SESSION VARIABLES LIKE "%e_format";
--error 1231
SET time_format='%h:%i:%s';