MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:bar Date:March 1 2007 2:16pm
Subject:bk commit into 5.1 tree (bar:1.2472)
View as plain text  
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
  1.2472 07/03/01 18:16:17 bar@stripped +7 -0
  After merge fix

  sql/log_event.cc
    1.273 07/03/01 18:16:13 bar@stripped +4 -4
    After merge fix

  mysql-test/t/mysqlbinlog.test
    1.37 07/03/01 18:16:13 bar@stripped +4 -3
    After merge fix

  mysql-test/t/ctype_cp932_binlog_stm.test
    1.4 07/03/01 18:16:13 bar@stripped +1 -1
    After merge fix

  mysql-test/r/mysqlbinlog.result
    1.30 07/03/01 18:16:13 bar@stripped +8 -7
    After merge fix

  mysql-test/r/ctype_cp932_binlog_stm.result
    1.4 07/03/01 18:16:13 bar@stripped +6 -6
    After merge fix

  mysql-test/r/rpl_loaddata_simple.result
    1.5 07/03/01 16:02:11 bar@stripped +0 -0
    Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_simple.result

  mysql-test/t/rpl_loaddata_simple.test
    1.5 07/03/01 16:01:49 bar@stripped +0 -0
    Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_simple.test

# 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.1-rpl

--- 1.272/sql/log_event.cc	2007-03-01 16:04:45 +04:00
+++ 1.273/sql/log_event.cc	2007-03-01 18:16:13 +04:00
@@ -1865,11 +1865,11 @@
   if (charset_database_number != print_event_info->charset_database_number)
   {
     if (charset_database_number)
-      fprintf(file, "SET @@session.collation_database=%d%s\n",
-              charset_database_number, print_event_info->delimiter);
+      my_b_printf(file, "SET @@session.collation_database=%d%s\n",
+                  charset_database_number, print_event_info->delimiter);
     else
-      fprintf(file, "SET @@session.collation_database=DEFAULT%s\n",
-              print_event_info->delimiter);
+      my_b_printf(file, "SET @@session.collation_database=DEFAULT%s\n",
+                  print_event_info->delimiter);
     print_event_info->charset_database_number= charset_database_number;
   }
 }

--- 1.29/mysql-test/r/mysqlbinlog.result	2007-03-01 16:04:45 +04:00
+++ 1.30/mysql-test/r/mysqlbinlog.result	2007-03-01 18:16:13 +04:00
@@ -308,26 +308,27 @@
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
 create table t1 (a varchar(64) character set utf8)/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
-load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-6-0' INTO table t1/*!*/;
+load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-6-0' INTO table t1/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.collation_database=7/*!*/;
-load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-7-0' INTO table t1/*!*/;
+load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-7-0' INTO table t1/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
-load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-8-0' INTO table t1/*!*/;
+load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-8-0' INTO table t1/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
-load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-9-0' INTO table t1/*!*/;
+load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-9-0' INTO table t1/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.collation_database=7/*!*/;
-load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-a-0' INTO table t1/*!*/;
+load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-a-0' INTO table t1/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
-load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-b-0' INTO table t1/*!*/;
+load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-b-0' INTO table t1/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
-load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/*!*/;
+load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 drop table t1/*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+flush logs;

--- 1.36/mysql-test/t/mysqlbinlog.test	2007-03-01 16:04:45 +04:00
+++ 1.37/mysql-test/t/mysqlbinlog.test	2007-03-01 18:16:13 +04:00
@@ -214,7 +214,8 @@
 select hex(a) from t1;
 drop table t1;
 flush logs;
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000011
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000012
 
 # End of 5.0 tests
 
@@ -223,7 +224,7 @@
 #
 flush logs;
 --error 1
---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null
---exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null
+--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000014 >/dev/null 2>/dev/null
+--exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000014 >/dev/null 2>/dev/null
 
 # End of 5.1 tests

--- 1.3/mysql-test/r/ctype_cp932_binlog_stm.result	2006-11-16 20:07:41 +04:00
+++ 1.4/mysql-test/r/ctype_cp932_binlog_stm.result	2007-03-01 18:16:13 +04:00
@@ -30,17 +30,17 @@
 466F6F2773206120426172	ED40ED41ED42	47.93
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 397|
+SHOW BINLOG EVENTS FROM 406|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	397	Query	1	560	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
+master-bin.000001	406	Query	1	572	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
 s2 CHAR(50) CHARACTER SET cp932,
 d DECIMAL(10,2))
-master-bin.000001	560	Query	1	805	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),
+master-bin.000001	572	Query	1	820	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	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
+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

--- 1.3/mysql-test/t/ctype_cp932_binlog_stm.test	2006-08-30 12:22:41 +05:00
+++ 1.4/mysql-test/t/ctype_cp932_binlog_stm.test	2007-03-01 18:16:13 +04:00
@@ -22,7 +22,7 @@
 SELECT HEX(s1),HEX(s2),d FROM t4|
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 397|
+SHOW BINLOG EVENTS FROM 406|
 delimiter ;|
 
 # End of 5.0 tests
Thread
bk commit into 5.1 tree (bar:1.2472)bar1 Mar