bk commit into 4.1 tree (jimw:1.2374) BUG#11569

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2374 05/08/03 17:38:55 jimw@stripped +3 -0
  Skip two tests that fail on Windows that just reflect limitations of
  that platform, not real failures. (Bug #12328, Bug #11569)

  mysql-test/include/not_windows.inc
    1.1 05/08/03 17:38:52 jimw@stripped +4 -0
    Add include for skipping tests on Windows

  mysql-test/t/rpl_flush_tables.test
    1.7 05/08/03 17:38:52 jimw@stripped +4 -1
    Skip this test on Windows

  mysql-test/t/packet.test
    1.6 05/08/03 17:38:52 jimw@stripped +3 -0
    Skip this test on Windows

  mysql-test/include/not_windows.inc
    1.0 05/08/03 17:38:52 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-12328/mysql-test/include/not_windows.inc

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-12328

--- 1.6/mysql-test/t/rpl_flush_tables.test	2005-07-27 17:21:47 -07:00
+++ 1.7/mysql-test/t/rpl_flush_tables.test	2005-08-03 17:38:52 -07:00
@@ -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);
--- New file ---
+++ mysql-test/include/not_windows.inc	05/08/03 17:38:52
--require r/true.require
disable_query_log;
select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE";
enable_query_log;


--- 1.5/mysql-test/t/packet.test	2005-07-27 17:21:46 -07:00
+++ 1.6/mysql-test/t/packet.test	2005-08-03 17:38:52 -07:00
@@ -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