bk commit into 5.0 tree (bar:1.2348)

[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@stripped, 2006-12-14 16:31:23+04:00, bar@stripped +2 -0
  After merge fix for bug N22645

  mysql-test/t/mysqlbinlog.test@stripped, 2006-12-14 16:31:19+04:00, bar@stripped +2 -2
    After merge fix

  sql/log_event.cc@stripped, 2006-12-14 16:31:19+04:00, bar@stripped +1 -1
    Fixing comment, thanks to Andrei for suggestion

# 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.0.b22645

--- 1.219/sql/log_event.cc	2006-12-14 16:31:32 +04:00
+++ 1.220/sql/log_event.cc	2006-12-14 16:31:32 +04:00
@@ -1089,7 +1089,7 @@ bool Query_log_event::write(IO_CACHE* fi
             1+4+           // code of autoinc and the 2 autoinc variables
             1+6+           // code of charset and charset
             1+1+MAX_TIME_ZONE_NAME_LENGTH+ // code of tz and tz length and tz name
-            1+2            // code of lc_time_names and lc_time_names
+            1+2            // code of lc_time_names and lc_time_names_number
             ], *start, *start_of_status;
   ulong event_length;
 

--- 1.35/mysql-test/t/mysqlbinlog.test	2006-12-14 16:31:32 +04:00
+++ 1.36/mysql-test/t/mysqlbinlog.test	2006-12-14 16:31:32 +04:00
@@ -171,8 +171,8 @@ call p1();
 drop procedure p1;
 --error 1305
 call p1();
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL
 call p1();
 drop procedure p1;