bk commit into 5.1 tree (bar:1.2366)

[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-16 20:07:46+04:00, bar@stripped +1 -0
  After merge fix: modifying test results according to the fix

  mysql-test/r/ctype_cp932_binlog_stm.result@stripped, 2006-11-16 20:07:41+04:00, bar@stripped
+3 -3
    After merge fix: modifying test results according to the 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.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1.b23619

--- 1.2/mysql-test/r/ctype_cp932_binlog_stm.result	2006-11-16 20:07:56 +04:00
+++ 1.3/mysql-test/r/ctype_cp932_binlog_stm.result	2006-11-16 20:07:56 +04:00
@@ -41,6 +41,6 @@ IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	805	Query	1	1010	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1'Foo\'s a Bar'),  NAME_CONST('ins2',_cp932 0xED40ED41ED42), 
NAME_CONST('ind',47.93))
-master-bin.000001	1010	Query	1	1096	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1096	Query	1	1172	use `test`; DROP TABLE t4
+master-bin.000001	805	Query	1	1021	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	1021	Query	1	1107	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1107	Query	1	1183	use `test`; DROP TABLE t4