14 files changed, 41 insertions, 36 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
+}
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 9217b607bb7..c6c5284e41b 100644
--- a/mysql-test/include/have_binlog_format_mixed_or_row.inc
+++ b/mysql-test/include/have_binlog_format_mixed_or_row.inc
@@ -1,7 +1,6 @@
 --source include/have_log_bin.inc
 
---require r/have_binlog_format_row.require
---disable_query_log
---replace_result MIXED ROW
-show variables like 'binlog_format';
---enable_query_log
+if (`SELECT @@binlog_format = 'STATEMENT'`)
+{
+  --skip Neither MIXED nor ROW binlog format
+}
diff --git a/mysql-test/include/have_binlog_format_mixed_or_statement.inc b/mysql-test/include/have_binlog_format_mixed_or_statement.inc
index 6010d1ee7a8..3888dd4b040 100644
--- a/mysql-test/include/have_binlog_format_mixed_or_statement.inc
+++ b/mysql-test/include/have_binlog_format_mixed_or_statement.inc
@@ -1,8 +1,7 @@
 source include/have_log_bin.inc;
 
 
---require r/have_binlog_format_statement.require
---disable_query_log
---replace_result MIXED STATEMENT
-show variables like 'binlog_format';
---enable_query_log
+if (`SELECT @@binlog_format = 'ROW'`)
+{
+  --skip Neither MIXED nor STATEMENT binlog format
+}
diff --git a/mysql-test/include/have_binlog_format_row.inc b/mysql-test/include/have_binlog_format_row.inc
index e3d40ae76a8..a946ccd6e4d 100644
--- a/mysql-test/include/have_binlog_format_row.inc
+++ b/mysql-test/include/have_binlog_format_row.inc
@@ -1,6 +1,6 @@
 --source include/have_log_bin.inc
 
--- require r/have_binlog_format_row.require
-disable_query_log;
-show variables like 'binlog_format';
-enable_query_log;
+if (`SELECT @@binlog_format != 'ROW'`)
+{
+  --skip Not ROW format
+}
diff --git a/mysql-test/include/have_binlog_format_row_or_statement.inc b/mysql-test/include/have_binlog_format_row_or_statement.inc
index 4b6413d062b..6ea0ecd6869 100644
--- a/mysql-test/include/have_binlog_format_row_or_statement.inc
+++ b/mysql-test/include/have_binlog_format_row_or_statement.inc
@@ -1,7 +1,8 @@
---source include/have_log_bin.inc
+source include/have_log_bin.inc;
+
+
+if (`SELECT @@binlog_format = 'MIXED'`)
+{
+  --skip Neither ROW nor STATEMENT binlog format
+}
 
--- require r/have_binlog_format_statement.require
---disable_query_log
---replace_result ROW STATEMENT
-show variables like 'binlog_format';
---enable_query_log
diff --git a/mysql-test/include/have_binlog_format_statement.inc b/mysql-test/include/have_binlog_format_statement.inc
index 1624773ec81..7253b0c726b 100644
--- a/mysql-test/include/have_binlog_format_statement.inc
+++ b/mysql-test/include/have_binlog_format_statement.inc
@@ -1,6 +1,6 @@
 --source include/have_log_bin.inc
 
--- require r/have_binlog_format_statement.require
-disable_query_log;
-show variables like 'binlog_format';
-enable_query_log;
+if (`SELECT @@binlog_format != 'STATEMENT'`)
+{
+  --skip Not STATEMENT format
+}
diff --git a/mysql-test/r/have_binlog_format_mixed.require b/mysql-test/r/have_binlog_format_mixed.require
deleted file mode 100644
index 4b752cbb314..00000000000
--- a/mysql-test/r/have_binlog_format_mixed.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-binlog_format	MIXED
diff --git a/mysql-test/r/have_binlog_format_row.require b/mysql-test/r/have_binlog_format_row.require
deleted file mode 100644
index 09ad32dbb9a..00000000000
--- a/mysql-test/r/have_binlog_format_row.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-binlog_format	ROW
diff --git a/mysql-test/r/have_binlog_format_statement.require b/mysql-test/r/have_binlog_format_statement.require
deleted file mode 100644
index 81e2e31cd6c..00000000000
--- a/mysql-test/r/have_binlog_format_statement.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-binlog_format	STATEMENT
diff --git a/mysql-test/r/partition_federated.result b/mysql-test/suite/federated/partition_federated.result
index 2d98e366c95..2d98e366c95 100644
--- a/mysql-test/r/partition_federated.result
+++ b/mysql-test/suite/federated/partition_federated.result
diff --git a/mysql-test/t/partition_federated.test b/mysql-test/suite/federated/partition_federated.test
index 0fe692ecd01..0fe692ecd01 100644
--- a/mysql-test/t/partition_federated.test
+++ b/mysql-test/suite/federated/partition_federated.test
diff --git a/mysql-test/suite/parts/t/disabled.def b/mysql-test/suite/parts/t/disabled.def
index e69de29bb2d..96592e78911 100644
--- a/mysql-test/suite/parts/t/disabled.def
+++ b/mysql-test/suite/parts/t/disabled.def
@@ -0,0 +1,13 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+partition_value_myisam : CAST() in partitioning function is currently not supported
+partition_value_innodb : CAST() in partitioning function is currently not supported
diff --git a/mysql-test/t/warnings_engine_disabled-master.opt b/mysql-test/t/warnings_engine_disabled-master.opt
deleted file mode 100644
index f51c1789a16..00000000000
--- a/mysql-test/t/warnings_engine_disabled-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---loose-skip-plugin-ndbcluster
diff --git a/mysql-test/t/warnings_engine_disabled.test b/mysql-test/t/warnings_engine_disabled.test
index 07a7e54c46c..11b22135128 100644
--- a/mysql-test/t/warnings_engine_disabled.test
+++ b/mysql-test/t/warnings_engine_disabled.test
@@ -4,7 +4,7 @@
 #
 if (!`SELECT count(*) FROM information_schema.engines WHERE
       support = 'NO' AND engine = 'innodb'`){
-  skip Needs innodb engine;
+  skip Needs compiled-in and disabled innodb engine;
 }