bk commit into 5.0 tree (kaa:1.2419)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa 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, 2007-02-20 22:29:18+03:00, kaa@stripped +1 -0
  Fixed the binlog numbering after changes introduced by patch for bug18743.

  mysql-test/t/mysqlbinlog.test@stripped, 2007-02-20 22:29:16+03:00, kaa@stripped +3 -3
    Fixed the binlog numbering after changes introduced by patch for bug18743.

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.0-maint

--- 1.37/mysql-test/t/mysqlbinlog.test	2007-02-20 22:29:24 +03:00
+++ 1.38/mysql-test/t/mysqlbinlog.test	2007-02-20 22:29:24 +03:00
@@ -135,7 +135,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.000005 | $MYSQL
 select * from t5 order by c1;
 #
 # Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
@@ -156,8 +156,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.000007
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
 call p1();
 drop procedure p1;