bk commit into 5.1 tree (bar:1.2363)

[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-14 17:48:32+04:00, bar@stripped +2 -0
  After merge fix for Bug N22645

  mysql-test/t/disabled.def@stripped, 2006-12-14 17:48:27+04:00, bar@stripped +0 -1
    After merge fix for Bug N22645

  sql/log_event.cc@stripped, 2006-12-14 17:48:27+04:00, bar@stripped +1 -1
    After merge fix for Bug N22645

# 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.1-rpl

--- 1.257/sql/log_event.cc	2006-12-14 16:42:24 +04:00
+++ 1.258/sql/log_event.cc	2006-12-14 17:48:27 +04:00
@@ -1844,7 +1844,7 @@
   }
   if (lc_time_names_number != print_event_info->lc_time_names_number)
   {
-    fprintf(file, "SET @@session.lc_time_names=%d;\n", lc_time_names_number);
+    my_b_printf(file, "SET @@session.lc_time_names=%d;\n", lc_time_names_number);
     print_event_info->lc_time_names_number= lc_time_names_number;
   }
 }

--- 1.223/mysql-test/t/disabled.def	2006-12-14 16:45:43 +04:00
+++ 1.224/mysql-test/t/disabled.def	2006-12-14 17:48:27 +04:00
@@ -21,7 +21,6 @@
 
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a
range partitioned NDB table
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain
LOCK_open
-rpl_locale               : Bug#22645 2006-12-05 bar
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD