From: bar
Date: February 28 2007 2:13pm
Subject: bk commit into 5.0 tree (bar:1.2428)
List-Archive: http://lists.mysql.com/commits/20777
Message-Id: <200702281413.l1SEDS5C028846@bar.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 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
  1.2428 07/02/28 18:13:23 bar@stripped +3 -0
  Additional test changes for
  Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
  Positions of some binlog events were changed because of
  additional logging of @@collation_database.

  mysql-test/t/ctype_cp932_binlog.test
    1.4 07/02/28 18:13:20 bar@stripped +1 -1
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

  mysql-test/r/ctype_cp932_notembedded.result
    1.2 07/02/28 18:13:20 bar@stripped +3 -3
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

  mysql-test/r/ctype_cp932_binlog.result
    1.7 07/02/28 18:13:20 bar@stripped +9 -9
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

# 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-5.0.b15126

--- 1.6/mysql-test/r/ctype_cp932_binlog.result	2006-11-09 14:27:12 +04:00
+++ 1.7/mysql-test/r/ctype_cp932_binlog.result	2007-02-28 18:13:20 +04:00
@@ -8,9 +8,9 @@
 EXECUTE stmt1 USING @var1;
 SHOW BINLOG EVENTS FROM 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	185	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	185	User var	1	224	@`var1`=_binary 0x8300 COLLATE binary
-master-bin.000001	224	Query	1	317	use `test`; INSERT INTO t1 VALUES(@'var1')
+master-bin.000001	98	Query	1	188	use `test`; CREATE TABLE t1(f1 blob)
+master-bin.000001	188	User var	1	227	@`var1`=_binary 0x8300 COLLATE binary
+master-bin.000001	227	Query	1	323	use `test`; INSERT INTO t1 VALUES(@'var1')
 SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300
@@ -30,17 +30,17 @@
 466F6F2773206120426172	ED40ED41ED42	47.93
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 393|
+SHOW BINLOG EVENTS FROM 402|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	393	Query	1	556	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
+master-bin.000001	402	Query	1	568	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
 s2 CHAR(50) CHARACTER SET cp932,
 d DECIMAL(10,2))
-master-bin.000001	556	Query	1	801	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),
+master-bin.000001	568	Query	1	816	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),
 IN ins2 CHAR(50) CHARACTER SET cp932,
 IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	801	Query	1	1017	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	1017	Query	1	1103	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1103	Query	1	1179	use `test`; DROP TABLE t4
+master-bin.000001	816	Query	1	1035	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	1035	Query	1	1124	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1124	Query	1	1203	use `test`; DROP TABLE t4

--- 1.3/mysql-test/t/ctype_cp932_binlog.test	2006-03-21 17:35:44 +04:00
+++ 1.4/mysql-test/t/ctype_cp932_binlog.test	2007-02-28 18:13:20 +04:00
@@ -51,7 +51,7 @@
 SELECT HEX(s1),HEX(s2),d FROM t4|
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 393|
+SHOW BINLOG EVENTS FROM 402|
 delimiter ;|
 
 # End of 5.0 tests

--- 1.1/mysql-test/r/ctype_cp932_notembedded.result	2006-02-24 20:34:09 +04:00
+++ 1.2/mysql-test/r/ctype_cp932_notembedded.result	2007-02-28 18:13:20 +04:00
@@ -8,9 +8,9 @@
 EXECUTE stmt1 USING @var1;
 SHOW BINLOG EVENTS FROM 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	185	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	185	User var	1	224	@`var1`=_binary 0x8300 COLLATE binary
-master-bin.000001	224	Query	1	317	use `test`; INSERT INTO t1 VALUES(@'var1')
+master-bin.000001	98	Query	1	188	use `test`; CREATE TABLE t1(f1 blob)
+master-bin.000001	188	User var	1	227	@`var1`=_binary 0x8300 COLLATE binary
+master-bin.000001	227	Query	1	323	use `test`; INSERT INTO t1 VALUES(@'var1')
 SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300