bk commit into 5.2 tree (bar:1.2524)

[bar]

Below is the list of changes that have just been committed into a local
5.2 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, 2007-06-20 17:17:35+05:00, bar@stripped +1 -0
  After merge fix

  mysql-test/r/ctype_cp932_binlog_stm.result@stripped, 2007-06-20 17:17:34+05:00, bar@stripped
+3 -3
    After merge fix

# 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-work/mysql-5.2-rpl

--- 1.8/mysql-test/r/ctype_cp932_binlog_stm.result	2007-06-18 17:23:24 +05:00
+++ 1.9/mysql-test/r/ctype_cp932_binlog_stm.result	2007-06-20 17:17:34 +05:00
@@ -41,9 +41,9 @@ IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	820	Query	1	1039	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	1039	Query	1	1128	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1128	Query	1	1207	use `test`; DROP TABLE t4
+master-bin.000001	824	Query	1	1043	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	1043	Query	1	1132	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1132	Query	1	1211	use `test`; DROP TABLE t4
 set names cp932;
 select @@collation_connection;
 @@collation_connection