bk commit into 5.1 tree (gkodinov:1.2566)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of gkodinov.  When gkodinov 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, 2008-02-22 16:27:02+02:00, gkodinov@stripped +1 -0
  merged bug 30604 to 5.1-opt

  mysql-test/r/ctype_cp932_binlog_stm.result@stripped, 2008-02-22 16:27:00+02:00,
gkodinov@stripped +3 -3
    merged bug 30604 to 5.1-opt

diff -Nrup a/mysql-test/r/ctype_cp932_binlog_stm.result
b/mysql-test/r/ctype_cp932_binlog_stm.result
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2007-08-13 16:11:09 +03:00
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2008-02-22 16:27:00 +02:00
@@ -40,9 +40,9 @@ IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	783	Query	1	999	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	999	Query	1	1088	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1088	Query	1	1167	use `test`; DROP TABLE t4
+master-bin.000001	783	Query	1	991	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	991	Query	1	1080	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1080	Query	1	1159	use `test`; DROP TABLE t4
 End of 5.0 tests
 SHOW BINLOG EVENTS FROM 364;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error