bk commit into 6.0 tree (gkodinov:1.2587)

[kgeorge]

Below is the list of changes that have just been committed into a local
6.0 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:59:19+02:00, gkodinov@stripped +1 -0
  merge of bug 30604 to 6.0-opt

  mysql-test/r/ctype_cp932_binlog_stm.result@stripped, 2008-02-22 16:59:16+02:00, gkodinov@stripped +3 -3
    merge of bug 30604 to 6.0-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	2008-02-22 16:31:27 +02:00
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2008-02-22 16:59:16 +02:00
@@ -40,9 +40,9 @@ IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	784	Query	1	1000	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	1000	Query	1	1089	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1089	Query	1	1168	use `test`; DROP TABLE t4
+master-bin.000001	784	Query	1	992	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	992	Query	1	1081	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1081	Query	1	1160	use `test`; DROP TABLE t4
 End of 5.0 tests
 SHOW BINLOG EVENTS FROM 365;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error