summaryrefslogtreecommitdiff
path: root/mysql-test/include/have_binlog_format_mixed.inc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-07-16 09:59:04 +0200
committerSergei Golubchik <sergii@pisem.net>2011-07-16 09:59:04 +0200
commit73a46b3eb954d92b1032d1c458ee349247800def (patch)
tree56a8513b1120f56f620898dc676d2f8920955af7 /mysql-test/include/have_binlog_format_mixed.inc
parent2853f6bfbb2f392fa5623b480a2ce112991d2486 (diff)
downloadmariadb-git-73a46b3eb954d92b1032d1c458ee349247800def.tar.gz
skipped tests: improve skip messages, move to a proper suite, disable as needed
mysql-test/include/have_binlog_format_mixed_or_row.inc: better skip message mysql-test/include/have_binlog_format_mixed_or_statement.inc: better skip message mysql-test/include/have_binlog_format_row_or_statement.inc: better skip message mysql-test/t/warnings_engine_disabled.test: better skip message
Diffstat (limited to 'mysql-test/include/have_binlog_format_mixed.inc')
-rw-r--r--mysql-test/include/have_binlog_format_mixed.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/have_binlog_format_mixed.inc b/mysql-test/include/have_binlog_format_mixed.inc
index f3e09f8649b..b061e0559dc 100644
--- a/mysql-test/include/have_binlog_format_mixed.inc
+++ b/mysql-test/include/have_binlog_format_mixed.inc
@@ -1,6 +1,6 @@
--source include/have_log_bin.inc
--- require r/have_binlog_format_mixed.require
-disable_query_log;
-show variables like 'binlog_format';
-enable_query_log;
+if (`SELECT @@binlog_format != 'MIXED'`)
+{
+ --skip Not MIXED format
+}