bk commit into 5.0 tree (bar:1.2427)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.2427 07/02/28 17:32:18 bar@stripped +2 -0
  After merge fix

  mysql-test/t/mysqlbinlog.test
    1.40 07/02/28 17:32:15 bar@stripped +0 -2
    After merge fix

  mysql-test/r/mysqlbinlog.result
    1.29 07/02/28 17:32:15 bar@stripped +0 -1
    After merge fix

# 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:	bar
# Host:	bar.myoffice.izhnet.ru
# Root:	/home/bar/mysql-5.0.b15126

--- 1.28/mysql-test/r/mysqlbinlog.result	2007-02-28 17:17:04 +04:00
+++ 1.29/mysql-test/r/mysqlbinlog.result	2007-02-28 17:32:15 +04:00
@@ -272,7 +272,6 @@
 1
 1
 drop procedure p1;
-drop table t1, t2, t03, t04, t3, t4, t5;
 flush logs;
 create table t1 (a varchar(64) character set utf8);
 load data infile '../std_data_ln/loaddata6.dat' into table t1;

--- 1.39/mysql-test/t/mysqlbinlog.test	2007-02-28 17:17:04 +04:00
+++ 1.40/mysql-test/t/mysqlbinlog.test	2007-02-28 17:32:15 +04:00
@@ -189,8 +189,6 @@
 --exec $MYSQL_BINLOG --version 2>&1 > /dev/null
 --exec $MYSQL_BINLOG --help 2>&1 > /dev/null
 --enable_query_log
-# clean up
-drop table t1, t2, t03, t04, t3, t4, t5; 
 
 #
 # Bug#15126 character_set_database is not replicated