Commit a8c24bf7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/home/bk/b19066-mysql-5.1-new


mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
parents cf83afee ddc25698

mysql-test/extra/rpl_tests/rpl_ddl.test

+3 −7
Original line number Diff line number Diff line
@@ -228,15 +228,11 @@ let $my_master_commit= true; 
let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SELECT * FROM mysqltest1.t7;

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

--echo -------- switch to slave --------

sync_slave_with_master;

SELECT * FROM mysqltest1.t7;

--echo -------- switch to master -------

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



###############################################################

# Cases with LOCK/UNLOCK

mysql-test/extra/rpl_tests/rpl_truncate.test

0 → 100644
+36 −0
Original line number Diff line number Diff line 
#

# Copyright 2006 MySQL. All rights reserved.

#

# Test to check for the different version of truncating a table.

# The statements are "TRUNCATE tbl" and "DELETE FROM tbl". We check

# the behaviour of each possible value for BINLOG_FORMAT.

#

# Author(s): Mats Kindahl



--source include/have_row_based.inc

--source include/master-slave.inc



let $format = STATEMENT;

let $stmt   = TRUNCATE TABLE;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = MIXED;

let $stmt   = TRUNCATE TABLE;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = ROW;

let $stmt   = TRUNCATE TABLE;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = STATEMENT;

let $stmt   = DELETE FROM;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = MIXED;

let $stmt   = DELETE FROM;

--source extra/rpl_tests/rpl_truncate_helper.inc



let $format = ROW;

let $stmt   = DELETE FROM;

--source extra/rpl_tests/rpl_truncate_helper.inc

mysql-test/extra/rpl_tests/rpl_truncate_helper.inc

0 → 100644
+40 −0
Original line number Diff line number Diff line 


--disable_query_log

--disable_warnings

connection slave;

STOP SLAVE;

connection master;

DROP TABLE IF EXISTS t1;

RESET MASTER;

connection slave;

DROP TABLE IF EXISTS t1;

RESET SLAVE;

START SLAVE;

--enable_warnings

--enable_query_log



--echo **** On Master ****

connection master;

eval SET SESSION BINLOG_FORMAT=$format;

eval SET GLOBAL  BINLOG_FORMAT=$format;



eval CREATE TABLE t1 (a INT, b LONG) ENGINE=$engine;

INSERT INTO t1 VALUES (1,1), (2,2);

SELECT * FROM t1;

--echo **** On Slave ****

sync_slave_with_master;

INSERT INTO t1 VALUE (3,3);

SELECT * FROM t1;

--echo **** On Master ****

connection master;

eval $stmt t1;

SELECT * FROM t1;

--echo **** On Slave ****

sync_slave_with_master;

# Should be empty

SELECT * FROM t1;

--echo **** On Master ****

connection master;

DROP TABLE t1;

--replace_regex /table_id: [0-9]+/table_id: #/

SHOW BINLOG EVENTS;

mysql-test/r/binlog_row_mix_innodb_myisam.result

+21 −17
Original line number Diff line number Diff line
@@ -262,23 +262,27 @@ master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F 
master-bin.000001	243	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	282	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	316	Xid	1	#	COMMIT /* xid= */

master-bin.000001	343	Query	1	#	use `test`; delete from t1

master-bin.000001	420	Xid	1	#	COMMIT /* xid= */

master-bin.000001	447	Query	1	#	use `test`; delete from t2

master-bin.000001	524	Xid	1	#	COMMIT /* xid= */

master-bin.000001	551	Query	1	#	use `test`; alter table t2 engine=MyISAM

master-bin.000001	642	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	681	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	715	Xid	1	#	COMMIT /* xid= */

master-bin.000001	742	Table_map	1	#	table_id: # (test.t2)

master-bin.000001	781	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	815	Query	1	#	use `test`; drop table t1,t2

master-bin.000001	894	Query	1	#	use `test`; create table t0 (n int)

master-bin.000001	980	Table_map	1	#	table_id: # (test.t0)

master-bin.000001	1019	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	1053	Table_map	1	#	table_id: # (test.t0)

master-bin.000001	1092	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	1126	Query	1	#	use `test`; create table t2 (n int) engine=innodb

master-bin.000001	343	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	382	Delete_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	421	Xid	1	#	COMMIT /* xid= */

master-bin.000001	448	Table_map	1	#	table_id: # (test.t2)

master-bin.000001	487	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	516	Xid	1	#	COMMIT /* xid= */

master-bin.000001	543	Query	1	#	use `test`; alter table t2 engine=MyISAM

master-bin.000001	634	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	673	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	707	Xid	1	#	COMMIT /* xid= */

master-bin.000001	734	Query	1	#	use `test`; BEGIN

master-bin.000001	802	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	841	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	870	Xid	1	#	COMMIT /* xid= */

master-bin.000001	897	Query	1	#	use `test`; drop table t1,t2

master-bin.000001	976	Query	1	#	use `test`; create table t0 (n int)

master-bin.000001	1062	Table_map	1	#	table_id: # (test.t0)

master-bin.000001	1101	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	1135	Table_map	1	#	table_id: # (test.t0)

master-bin.000001	1174	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	1208	Query	1	#	use `test`; create table t2 (n int) engine=innodb

do release_lock("lock1");

drop table t0,t2;

reset master;

mysql-test/r/federated.result

+3 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ t2 CREATE TABLE `t2` ( 
) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'

INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');

INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');

SELECT * FROM federated.t2;

SELECT * FROM federated.t2 ORDER BY id, name;

id	name

1	foo

2	fee
@@ -107,7 +107,7 @@ ENGINE="FEDERATED" DEFAULT CHARSET=latin1 
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';

INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');

INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');

SELECT * FROM federated.t1;

SELECT * FROM federated.t1 ORDER BY id,name;

id	name

1	foo

2	fee
@@ -121,7 +121,7 @@ ENGINE="FEDERATED" DEFAULT CHARSET=latin1 
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';

INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');

INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');

SELECT * FROM federated.`t1%`;

SELECT * FROM federated.`t1%` ORDER BY id, name;

id	name

1	foo

2	fee