MySQL Lists: internals: bk commit into 5.0 tree (lars:1.1989)

List:	Internals	« Previous Message Next Message »
From:	Lars Thalmann	Date:	September 21 2005 12:27pm
Subject:	bk commit into 5.0 tree (lars:1.1989)
View as plain text
Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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.1989 05/09/21 14:27:41 lars@stripped +7 -0
  Added clarification comment regarding added ROLLBACK to mysqlbinlog output

  mysql-test/r/user_var-binlog.result
    1.3 05/09/21 14:27:34 lars@stripped +1 -0
    Added clarification comment regarding added ROLLBACK to mysqlbinlog output

  mysql-test/r/rpl_timezone.result
    1.11 05/09/21 14:27:34 lars@stripped +1 -0
    Added clarification comment regarding added ROLLBACK to mysqlbinlog output

  mysql-test/r/rpl_charset.result
    1.19 05/09/21 14:27:33 lars@stripped +1 -0
    Added clarification comment regarding added ROLLBACK to mysqlbinlog output

  mysql-test/r/mysqlbinlog2.result
    1.7 05/09/21 14:27:33 lars@stripped +25 -0
    Added clarification comment regarding added ROLLBACK to mysqlbinlog output

  mysql-test/r/mysqlbinlog.result
    1.17 05/09/21 14:27:33 lars@stripped +10 -0
    Added clarification comment regarding added ROLLBACK to mysqlbinlog output

  mysql-test/r/ctype_ucs_binlog.result
    1.3 05/09/21 14:27:33 lars@stripped +1 -0
    Added clarification comment regarding added ROLLBACK to mysqlbinlog output

  client/mysqlbinlog.cc
    1.114 05/09/21 14:27:33 lars@stripped +1 -1
    Added clarification comment regarding added ROLLBACK to mysqlbinlog output

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-rollback-comment

--- 1.113/client/mysqlbinlog.cc	2005-08-26 14:56:46 +02:00
+++ 1.114/client/mysqlbinlog.cc	2005-09-21 14:27:33 +02:00
@@ -1434,7 +1434,7 @@
     of transaction.
   */
   fprintf(result_file,
-          "ROLLBACK;\n"
+          "# End of log file\nROLLBACK;\n"
           "/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;\n");
   if (disable_log_bin)
     fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");

--- 1.10/mysql-test/r/rpl_timezone.result	2005-03-24 16:43:40 +01:00
+++ 1.11/mysql-test/r/rpl_timezone.result	2005-09-21 14:27:34 +02:00
@@ -63,6 +63,7 @@
 SET TIMESTAMP=100000000;
 SET @@session.time_zone='Europe/Moscow';
 insert into t1 values ('20040101000000'), ('20040611093902');
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 delete from t1;

--- 1.16/mysql-test/r/mysqlbinlog.result	2005-03-16 02:32:40 +01:00
+++ 1.17/mysql-test/r/mysqlbinlog.result	2005-09-21 14:27:33 +02:00
@@ -39,6 +39,7 @@
 load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-3-0' INTO table t1;
 SET TIMESTAMP=1000000000;
 load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-4-0' INTO table t1;
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -51,6 +52,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values ("Alas");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -59,6 +61,7 @@
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 ROLLBACK;
 SET INSERT_ID=1;
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -71,6 +74,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values ("Alas");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -101,6 +105,7 @@
 load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-3-2' INTO table t1;
 SET TIMESTAMP=1000000000;
 load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-4-2' INTO table t1;
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -113,6 +118,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values ("Alas");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -121,6 +127,7 @@
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 ROLLBACK;
 SET INSERT_ID=1;
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -133,6 +140,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values ("Alas");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -145,6 +153,7 @@
 BEGIN;
 SET TIMESTAMP=1108844555;
 insert t1 values (1);
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
@@ -154,6 +163,7 @@
 BEGIN;
 SET TIMESTAMP=1108844555;
 insert t1 values (1);
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 drop table t1, t2;

--- 1.6/mysql-test/r/mysqlbinlog2.result	2005-02-23 19:44:27 +01:00
+++ 1.7/mysql-test/r/mysqlbinlog2.result	2005-09-21 14:27:33 +02:00
@@ -39,6 +39,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -65,6 +66,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -81,6 +83,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -103,6 +106,7 @@
 SET INSERT_ID=3;
 SET TIMESTAMP=1579609944;
 insert into t1 values(null, "c");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -123,6 +127,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -142,6 +147,7 @@
 SET INSERT_ID=2;
 SET TIMESTAMP=1579609942;
 insert into t1 values(null, "b");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -177,6 +183,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -210,6 +217,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -233,6 +241,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -262,6 +271,7 @@
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
 SET INSERT_ID=6;
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -289,6 +299,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -308,6 +319,7 @@
 SET INSERT_ID=2;
 SET TIMESTAMP=1579609942;
 insert into t1 values(null, "b");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -336,6 +348,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -362,6 +375,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -378,6 +392,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -400,6 +415,7 @@
 SET INSERT_ID=3;
 SET TIMESTAMP=1579609944;
 insert into t1 values(null, "c");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -420,6 +436,7 @@
 SET INSERT_ID=5;
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -439,6 +456,7 @@
 SET INSERT_ID=2;
 SET TIMESTAMP=1579609942;
 insert into t1 values(null, "b");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -474,6 +492,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -507,6 +526,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -530,6 +550,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -559,6 +580,7 @@
 SET TIMESTAMP=1579609946;
 insert into t1 values(null, "e");
 SET INSERT_ID=6;
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -586,6 +608,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -605,6 +628,7 @@
 SET INSERT_ID=2;
 SET TIMESTAMP=1579609942;
 insert into t1 values(null, "b");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 
@@ -636,6 +660,7 @@
 SET INSERT_ID=6;
 SET TIMESTAMP=1579609943;
 insert into t1 values(null, "f");
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 

--- 1.18/mysql-test/r/rpl_charset.result	2005-03-16 02:32:40 +01:00
+++ 1.19/mysql-test/r/rpl_charset.result	2005-09-21 14:27:33 +02:00
@@ -246,6 +246,7 @@
 SET TIMESTAMP=1000000000;
 SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30;
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 drop table t1;

--- 1.2/mysql-test/r/ctype_ucs_binlog.result	2005-04-05 01:34:21 +02:00
+++ 1.3/mysql-test/r/ctype_ucs_binlog.result	2005-09-21 14:27:33 +02:00
@@ -17,6 +17,7 @@
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t2 values (@v);
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 drop table t2;

--- 1.2/mysql-test/r/user_var-binlog.result	2005-04-05 01:34:21 +02:00
+++ 1.3/mysql-test/r/user_var-binlog.result	2005-09-21 14:27:34 +02:00
@@ -27,6 +27,7 @@
 SET @`var2`:=_latin1 0x61 COLLATE `latin1_swedish_ci`;
 SET TIMESTAMP=10000;
 insert into t1 values (@var1),(@var2);
+# End of log file
 ROLLBACK;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 drop table t1;
Thread
• bk commit into 5.0 tree (lars:1.1989)	Lars Thalmann	21 Sep