diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_binlog_format_mixed.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_binlog_format_mixed_or_row.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_binlog_format_row.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_binlog_format_statement.inc | 2 | ||||
| -rw-r--r-- | mysql-test/r/date_formats.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/date_formats.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/ndb_binlog_basic2.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/ps.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_sf.test | 2 |
9 files changed, 18 insertions, 12 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"; diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 7375260d863..11717679b42 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -1,17 +1,13 @@ drop table if exists t1; -SHOW GLOBAL VARIABLES LIKE "%_format%"; +SHOW GLOBAL VARIABLES LIKE "%e_format"; Variable_name Value -binlog_format <format> date_format %d.%m.%Y datetime_format %Y-%m-%d %H:%i:%s -default_week_format 0 time_format %H.%i.%s -SHOW SESSION VARIABLES LIKE "%_format%"; +SHOW SESSION VARIABLES LIKE "%e_format"; Variable_name Value -binlog_format <format> date_format %d.%m.%Y datetime_format %Y-%m-%d %H:%i:%s -default_week_format 0 time_format %H.%i.%s SET time_format='%H%i%s'; SET time_format='%H:%i:%s.%f'; @@ -30,12 +26,10 @@ set datetime_format= '%H:%i:%s %Y-%m-%d'; set datetime_format= '%H:%i:%s.%f %m-%d-%Y'; set datetime_format= '%h:%i:%s %p %Y-%m-%d'; set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d'; -SHOW SESSION VARIABLES LIKE "%format"; +SHOW SESSION VARIABLES LIKE "%e_format"; Variable_name Value -binlog_format <format> date_format %m-%d-%Y datetime_format %h:%i:%s.%f %p %Y-%m-%d -default_week_format 0 time_format %h:%i:%s%p SET time_format='%h:%i:%s'; ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s' 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'; diff --git a/mysql-test/t/ndb_binlog_basic2.test b/mysql-test/t/ndb_binlog_basic2.test index 9fa9f2f965a..bcc6b503320 100644 --- a/mysql-test/t/ndb_binlog_basic2.test +++ b/mysql-test/t/ndb_binlog_basic2.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/have_log_bin.inc --error ER_NDB_CANT_SWITCH_BINLOG_FORMAT set session binlog_format=row; diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index c6aa05df900..ef8e78cea9f 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -1,4 +1,5 @@ -- source include/not_embedded.inc +-- source include/have_log_bin.inc # # SQL Syntax for Prepared Statements test # diff --git a/mysql-test/t/rpl_sf.test b/mysql-test/t/rpl_sf.test index 2b1e0350f1b..ecf91a723fa 100644 --- a/mysql-test/t/rpl_sf.test +++ b/mysql-test/t/rpl_sf.test @@ -1,3 +1,5 @@ +-- source include/have_log_bin.inc + # Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR # save status |