bk commit into 5.1 tree (bar:1.2364)

[bar]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2006-12-22 11:43:04+04:00, bar@stripped +1 -0
  After merge fix

  mysql-test/t/mysqlbinlog.test@stripped, 2006-12-22 11:43:00+04:00, bar@stripped +5 -5
    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.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1.b17642

--- 1.33/mysql-test/t/mysqlbinlog.test	2006-12-22 11:43:14 +04:00
+++ 1.34/mysql-test/t/mysqlbinlog.test	2006-12-22 11:43:14 +04:00
@@ -153,7 +153,7 @@ insert into t5 values (3, date_format('2
 select * from t5 order by c1;
 flush logs;
 drop table t5;
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008 | $MYSQL
 select * from t5 order by c1;
 #
 # Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
@@ -174,8 +174,8 @@ call p1();
 drop procedure p1;
 --error 1305
 call p1();
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000010
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000010 | $MYSQL
 call p1();
 drop procedure p1;
 
@@ -189,7 +189,7 @@ drop table t1, t2, t03, t04, t3, t4, t5;
 #
 flush logs;
 --error 1
---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000010 >/dev/null 2>/dev/null
---exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000010
>/dev/null 2>/dev/null
+--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null
+--exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000012
>/dev/null 2>/dev/null
 
 # End of 5.1 tests