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-22 11:20:55+04:00, bar@stripped +2 -0
  Merge abarkov@stripped:/home/bk/mysql-5.1-rpl
  into  mysql.com:/usr/home/bar/mysql-5.1.b17642
  MERGE: 1.2361.1.2

  mysql-test/r/mysqlbinlog.result@stripped, 2006-12-22 11:15:37+04:00, bar@stripped +0 -0
    Auto merged
    MERGE: 1.25.1.1

  mysql-test/t/mysqlbinlog.test@stripped, 2006-12-22 11:20:41+04:00, bar@stripped +0 -2
    After merge fix
    MERGE: 1.31.1.1

# 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/RESYNC

--- 1.26/mysql-test/r/mysqlbinlog.result	2006-12-22 11:21:06 +04:00
+++ 1.27/mysql-test/r/mysqlbinlog.result	2006-12-22 11:21:06 +04:00
@@ -215,6 +215,26 @@ select * from t5  /* must be (1),(1) */;
 a
 1
 1
+flush logs;
+drop table if exists t5;
+create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
+insert into t5 values (1, date_format('2001-01-01','%W'));
+set lc_time_names=de_DE;
+insert into t5 values (2, date_format('2001-01-01','%W'));
+set lc_time_names=en_US;
+insert into t5 values (3, date_format('2001-01-01','%W'));
+select * from t5 order by c1;
+c1	c2
+1	Monday
+2	Montag
+3	Monday
+flush logs;
+drop table t5;
+select * from t5 order by c1;
+c1	c2
+1	Monday
+2	Montag
+3	Monday
 drop procedure if exists p1;
 flush logs;
 create procedure p1()

--- 1.32/mysql-test/t/mysqlbinlog.test	2006-12-22 11:21:06 +04:00
+++ 1.33/mysql-test/t/mysqlbinlog.test	2006-12-22 11:21:06 +04:00
@@ -138,6 +138,24 @@ flush logs;
 select * from t5  /* must be (1),(1) */;
 
 #
+# Bug#22645 LC_TIME_NAMES: Statement not replicated
+# Check that a dump created by mysqlbinlog reproduces
+# lc_time_names dependent values correctly
+#
+flush logs;
+drop table if exists t5;
+create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
+insert into t5 values (1, date_format('2001-01-01','%W'));
+set lc_time_names=de_DE;
+insert into t5 values (2, date_format('2001-01-01','%W'));
+set lc_time_names=en_US;
+insert into t5 values (3, date_format('2001-01-01','%W'));
+select * from t5 order by c1;
+flush logs;
+drop table t5;
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
+select * from t5 order by c1;
+#
 # Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
 #
 --disable_warnings
@@ -156,8 +174,8 @@ call p1();
 drop procedure p1;
 --error 1305
 call p1();
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008 | $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;