Skip two tests that fail on Windows that just reflect limitations of

that platform, not real failures. (Bug #12328, Bug #11569)

3 files changed, 11 insertions, 1 deletions

diff --git a/mysql-test/include/not_windows.inc b/mysql-test/include/not_windows.inc
new file mode 100644
index 00000000000..54e9e0e817a
--- /dev/null
+++ b/mysql-test/include/not_windows.inc
@@ -0,0 +1,4 @@
+--require r/true.require
+disable_query_log;
+select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE";
+enable_query_log;
diff --git a/mysql-test/t/packet.test b/mysql-test/t/packet.test
index 04122b42b44..4de284b7824 100644
--- a/mysql-test/t/packet.test
+++ b/mysql-test/t/packet.test
@@ -1,5 +1,8 @@
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
+# Windows fails because it disconnects on too-large packets instead of just
+# swallowing them and returning an error
+--source include/not_windows.inc
 
 #
 # Check protocol handling
diff --git a/mysql-test/t/rpl_flush_tables.test b/mysql-test/t/rpl_flush_tables.test
index 846e2cd56ee..04158aed9e0 100644
--- a/mysql-test/t/rpl_flush_tables.test
+++ b/mysql-test/t/rpl_flush_tables.test
@@ -3,7 +3,10 @@
 # RENAME TABLE work with MERGE tables on the slave.
 # Test of FLUSH NO_WRITE_TO_BINLOG by the way.
 #
-source include/master-slave.inc;
+--source include/master-slave.inc
+# Skipped on Windows because it can't handle a table underlying an open
+# merge table getting renamed.
+--source include/not_windows.inc
 
 create table t1 (a int);
 insert into t1 values (10);