List:Commits« Previous MessageNext Message »
From:msvensson Date:July 26 2006 9:08am
Subject:bk commit into 4.1 tree (msvensson:1.2524) BUG#21218
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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

ChangeSet@stripped, 2006-07-26 11:08:15+02:00, msvensson@neptunus.(none) +1 -0
  Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows
   - Modify test case to workaround the test tool problem
   - (Null merge into 5.0)

  mysql-test/t/mysqlbinlog.test@stripped, 2006-07-26 11:08:13+02:00, msvensson@neptunus.(none) +4 -2
    Send the ouput from "mysqlbinlog" to a file and then read execute it with "mysql"
    This is a workaround for a windows bug in the test tools in mysql-4.1, which makes
    it impossible to use "|" to send the output from one program directly to the other.
    This has been fixed in mysql-5.0. 

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/my41-bug21218

--- 1.21/mysql-test/t/mysqlbinlog.test	2006-07-26 11:08:18 +02:00
+++ 1.22/mysql-test/t/mysqlbinlog.test	2006-07-26 11:08:18 +02:00
@@ -107,7 +107,8 @@ create table t4 (f text character set cp
 flush logs;
 rename table t3 to t03, t4 to t04;
---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000004 | $MYSQL --default-character-set=utf8
+--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000004 > $MYSQL_TEST_DIR/var/tmp/bug16217.sql
+--exec $MYSQL --default-character-set=utf8 < $MYSQL_TEST_DIR/var/tmp/bug16217.sql
 # original and recovered data must be equal
 select HEX(f) from t03;
 select HEX(f) from t3;
@@ -123,7 +124,8 @@ flush logs;
 # resulted binlog, parly consisting of multi-byte utf8 chars, 
 # must be digestable for both client and server. In 4.1 the client 
 # should use default-character-set same as the server.
---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000006 | $MYSQL
+--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000006 > $MYSQL_TEST_DIR/var/tmp/bug14157.sql
+--exec $MYSQL < $MYSQL_TEST_DIR/var/tmp/bug14157.sql
 select * from t5  /* must be (1),(1) */;
 # clean up
bk commit into 4.1 tree (msvensson:1.2524) BUG#21218msvensson26 Jul