Commit c566fc08 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-12328 

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents cd0f12b5 9942ad01

mysql-test/include/not_windows.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/true.require

disable_query_log;

select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE";

enable_query_log;

mysql-test/t/packet.test

+3 −0
Original line number Diff line number Diff line 
# 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

mysql-test/t/rpl_flush_tables.test

+4 −1
Original line number Diff line number Diff line
@@ -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);