bk commit into 5.1 tree (bar:1.2373) BUG#17642

[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-11-24 15:38:41+04:00, bar@stripped +2 -0
  Bug#17642 mysqlbinlog: Restore from row-based binlog fails
  Problem: mysqlbinlog_base64 failed sporadically.
  Reason: "mysqlbinglog --hexdump" could start before server
  writes everything into the log
  Fix: adding "flush logs" to garantee dumping at
  the safe moment of time.

  mysql-test/r/mysqlbinlog_base64.result@stripped, 2006-11-24 15:38:36+04:00, bar@stripped +1
-0
    Fixing result file accordingly

  mysql-test/t/mysqlbinlog_base64.test@stripped, 2006-11-24 15:38:36+04:00, bar@stripped +6 -0
    Adding "flush logs"

# 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.2/mysql-test/r/mysqlbinlog_base64.result	2006-11-24 15:38:52 +04:00
+++ 1.3/mysql-test/r/mysqlbinlog_base64.result	2006-11-24 15:38:52 +04:00
@@ -6,6 +6,7 @@ update t1 set a=a+2 where a=2;
 update t1 set a=a+2 where a=3;
 create table t2 (word varchar(20));
 load data infile '../std_data_ln/words.dat' into table t2;
+flush logs;
 drop table t1;
 drop table t2;
 select * from t1;

--- 1.2/mysql-test/t/mysqlbinlog_base64.test	2006-11-24 15:38:52 +04:00
+++ 1.3/mysql-test/t/mysqlbinlog_base64.test	2006-11-24 15:38:52 +04:00
@@ -13,6 +13,12 @@ create table t2 (word varchar(20));
 load data infile '../std_data_ln/words.dat' into table t2;
 
 #
+# Make sure we don't start "mysqlbinlog --hexdump"
+# before server has finished writting into binlog
+#
+flush logs;
+
+#
 #  Save binlog
 #
 --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 >
$MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql