diff options
Diffstat (limited to 'mysql-test/t')
| -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 |
4 files changed, 7 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'; 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 |