Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new (19b40124) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/extra/rpl_tests/rpl_flsh_tbls.test

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@
		# RENAME TABLE work with MERGE tables on the slave.
		# Test of FLUSH NO_WRITE_TO_BINLOG by the way.
		#


		-- source include/master-slave.inc

		create table t1 (a int);

+8 −8

Original line number	Diff line number	Diff line
		@@ -26,25 +26,25 @@ DROP TABLE IF EXISTS test.t2;
		INSERT INTO test.t3 VALUES(NULL,11111111.233333,NOW());
		END\|
		CALL test.p1();
		SELECT * FROM test.t1;
		SELECT * FROM test.t1 ORDER BY a;
		a
		1
		2
		3
		12
		SELECT * FROM test.t2;
		SELECT * FROM test.t2 ORDER BY a;
		a
		1
		2
		3
		8
		SELECT * FROM test.t1;
		SELECT * FROM test.t1 ORDER BY a;
		a
		1
		2
		3
		12
		SELECT * FROM test.t2;
		SELECT * FROM test.t2 ORDER BY a;
		a
		1
		2
		@@ -62,25 +62,25 @@ t3
		CALL test.p1();
		Warnings:
		Note 1050 Table 't3' already exists
		SELECT * FROM test.t1;
		SELECT * FROM test.t1 ORDER BY a;
		a
		1
		2
		3
		12
		SELECT * FROM test.t2;
		SELECT * FROM test.t2 ORDER BY a;
		a
		1
		2
		3
		8
		SELECT * FROM test.t1;
		SELECT * FROM test.t1 ORDER BY a;
		a
		1
		2
		3
		12
		SELECT * FROM test.t2;
		SELECT * FROM test.t2 ORDER BY a;
		a
		1
		2

+4 −0

Original line number	Diff line number	Diff line
		# See if replication between MyISAM, MEMORY and InnoDB works.

		#This test case is not written for NDB, result files do not
		#match when NDB is the default engine
		-- source include/not_ndb_default.inc

		-- source include/master-slave.inc

		connection slave;

+6 −0

Original line number	Diff line number	Diff line
		--source include/have_row_based.inc
		--source include/have_binlog_format_row.inc


		#This test case is not written for NDB, the result files
		#will not match when NDB is the default engine
		-- source include/not_ndb_default.inc

		--source include/master-slave.inc

		# Bug#15942 (RBR ignores --binlog_ignore_db and tries to map to table

+5 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,11 @@ let $rename_event_pos= 615;
		# Bug#18326: Do not lock table for writing during prepare of statement
		# The use of the ps protocol causes extra table maps in the binlog, so
		# we disable the ps-protocol for this statement.

		# Merge tables are not supported in NDB
		-- source include/not_ndb_default.inc


		--disable_ps_protocol
		-- source extra/rpl_tests/rpl_flsh_tbls.test
		--enable_ps_protocol