MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Serge Kozlov Date:June 29 2007 5:09pm
Subject:bk commit into 5.1 tree (skozlov:1.2546) BUG#29363
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ksm. When ksm 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, 2007-06-29 21:09:00+04:00, skozlov@stripped +6 -0
  Bug#29363

  mysql-test/suite/rpl/include/rpl_mixed_ddl.inc@stripped, 2007-06-29 21:08:49+04:00, skozlov@stripped +1 -1
    removed Server version from SHOW BINLOG EVENTS

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@stripped, 2007-06-29 21:08:49+04:00, skozlov@stripped +2 -2
    removed Server version from SHOW BINLOG EVENTS

  mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result@stripped, 2007-06-29 21:08:49+04:00, skozlov@stripped +1 -1
    updated result file

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@stripped, 2007-06-29 21:08:49+04:00, skozlov@stripped +9 -3
    updated result file

  mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test@stripped, 2007-06-29 21:08:49+04:00, skozlov@stripped +2 -1
    skip test for row/statement

  mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test@stripped, 2007-06-29 21:08:49+04:00, skozlov@stripped +2 -1
    skip test for row/statement

# 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:	skozlov
# Host:	virtop.localdomain
# Root:	/home/ksm/commits/mysql-5.1-new-rpl

--- 1.1/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc	2007-06-29 21:09:17 +04:00
+++ 1.2/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc	2007-06-29 21:09:17 +04:00
@@ -67,7 +67,7 @@
 --echo
 --echo ******************** SHOW BINLOG EVENTS ********************
 --replace_column 2 # 5 #
---replace_regex /table_id: [0-9]+/table_id: #/
+--replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/
 show binlog events from 1;
 sync_slave_with_master;
 # as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID

--- 1.1/mysql-test/suite/rpl/include/rpl_mixed_dml.inc	2007-06-29 21:09:17 +04:00
+++ 1.2/mysql-test/suite/rpl/include/rpl_mixed_dml.inc	2007-06-29 21:09:17 +04:00
@@ -326,8 +326,8 @@
 --echo
 --echo ******************** SHOW BINLOG EVENTS ********************
 --replace_column 2 # 5 #
---replace_regex /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/
-show binlog events from 102;
+--replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/
+show binlog events from 1;
 sync_slave_with_master;
 # as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test_rpl > $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql

--- 1.2/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result	2007-06-29 21:09:17 +04:00
+++ 1.3/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result	2007-06-29 21:09:17 +04:00
@@ -138,7 +138,7 @@
 ******************** SHOW BINLOG EVENTS ********************
 show binlog events from 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Format_desc	1	#	Server ver: 5.1.16-beta-debug-log, Binlog ver: 4
+master-bin.000001	#	Format_desc	1	#	Server ver: #
 master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test_rpl
 master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test_rpl_1
 master-bin.000001	#	Query	1	#	CREATE DATABASE test_rpl_1 CHARACTER SET utf8 COLLATE utf8_general_ci

--- 1.3/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2007-06-29 21:09:17 +04:00
+++ 1.4/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2007-06-29 21:09:17 +04:00
@@ -684,11 +684,12 @@
 ==========MASTER==========
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator
-test_rpl	e1	root@localhost	RECURRING	NULL	1	SECOND	#	#	ENABLED
+test_rpl	e1	root@localhost	SYSTEM	RECURRING	NULL	1	#	#	NULL	ENABLED	1
 ==========SLAVE===========
 USE test_rpl;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator
+test_rpl	e1	@	SYSTEM	RECURRING	NULL	1	#	#	NULL	SLAVESIDE_DISABLED	1
 ==========MASTER==========
 SELECT COUNT(*) FROM t1;
 COUNT(*)
@@ -743,11 +744,12 @@
 ==========MASTER==========
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator
-test_rpl	e2	root@localhost	RECURRING	NULL	1	SECOND	#	#	ENABLED
+test_rpl	e2	root@localhost	SYSTEM	RECURRING	NULL	1	#	#	NULL	ENABLED	1
 ==========SLAVE===========
 USE test_rpl;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator
+test_rpl	e2	@	SYSTEM	RECURRING	NULL	1	#	#	NULL	SLAVESIDE_DISABLED	1
 ==========MASTER==========
 SELECT COUNT(*) FROM t1;
 COUNT(*)
@@ -827,8 +829,9 @@
 
 
 ******************** SHOW BINLOG EVENTS ********************
-show binlog events from 102;
+show binlog events from 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Format_desc	1	#	Server ver: #
 master-bin.000001	#	Query	1	#	CREATE DATABASE test_rpl
 master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE TABLE t1 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
 master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE TABLE t2 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
@@ -1011,6 +1014,9 @@
 master-bin.000001	#	Query	1	#	use `test_rpl`; GRANT EVENT ON *.* TO 'root'@'localhost'
 master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 'test1')
 master-bin.000001	#	Xid	1	#	#
+master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE EVENT e1 ON SCHEDULE EVERY '1' SECOND COMMENT 'e_second_comment' DO DELETE FROM t1
+master-bin.000001	#	Query	1	#	use `test_rpl`; ALTER EVENT e1 RENAME TO e2
+master-bin.000001	#	Query	1	#	use `test_rpl`; DROP EVENT e2
 master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
 master-bin.000001	#	Xid	1	#	#
 master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2

--- 1.1/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test	2007-06-29 21:09:17 +04:00
+++ 1.2/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test	2007-06-29 21:09:17 +04:00
@@ -5,9 +5,10 @@
 # Requirements: define binlog format for mysqld as in example below:
 # ./mysql-test-run.pl --mysqld=--binlog-format=mixed
 #########################################
-
+--source include/have_binlog_format_mixed.inc
 --source include/have_innodb.inc
 let $engine_type= innodb;
 
 --source suite/rpl/include/rpl_mixed_ddl.inc
 
+# End 5.1 Test Case

--- 1.1/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test	2007-06-29 21:09:17 +04:00
+++ 1.2/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test	2007-06-29 21:09:17 +04:00
@@ -5,9 +5,10 @@
 # Requirements: define binlog format for mysqld as in example below:
 # ./mysql-test-run.pl --mysqld=--binlog-format=mixed
 #########################################
-
+--source include/have_binlog_format_mixed.inc
 --source include/have_innodb.inc
 let $engine_type= innodb;
 
 --source suite/rpl/include/rpl_mixed_dml.inc
 
+# End 5.1 Test Case
Thread
bk commit into 5.1 tree (skozlov:1.2546) BUG#29363Serge Kozlov29 Jun