Commit 94323301 authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
parents 06045451 bd7fccb0

mysql-test/extra/rpl_tests/rpl_flsh_tbls.test

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
# RENAME TABLE work with MERGE tables on the slave.

# Test of FLUSH NO_WRITE_TO_BINLOG by the way.

#



# Merge will not work with a default ndb engine

-- source include/not_ndb_default.inc



-- source include/master-slave.inc



create table t1 (a int);

mysql-test/r/rpl_sp004.result

+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

mysql-test/t/rpl_multi_engine.test

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



# Results files do not match when ndb is default

-- source include/not_ndb_default.inc



-- source include/master-slave.inc



connection slave;

mysql-test/t/rpl_row_basic_11bugs.test

+4 −0
Original line number Diff line number Diff line 
--source include/have_row_based.inc

--source include/have_binlog_format_row.inc



# Show binlog events will cause failure when ndb is default

-- source include/not_ndb_default.inc



--source include/master-slave.inc



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

mysql-test/t/rpl_sp004.test

+8 −8
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ END| 
delimiter ;|



CALL test.p1();

SELECT * FROM test.t1;

SELECT * FROM test.t2;

SELECT * FROM test.t1 ORDER BY a;

SELECT * FROM test.t2 ORDER BY a;

save_master_pos;

connection slave;

sync_with_master;

SELECT * FROM test.t1;

SELECT * FROM test.t2;

SELECT * FROM test.t1 ORDER BY a;

SELECT * FROM test.t2 ORDER BY a;



connection master;

CALL test.p2();
@@ -66,14 +66,14 @@ SHOW TABLES; 


connection master;

CALL test.p1();

SELECT * FROM test.t1;

SELECT * FROM test.t2;

SELECT * FROM test.t1 ORDER BY a;

SELECT * FROM test.t2 ORDER BY a;

#SELECT * FROM test.t3;

save_master_pos;

connection slave;

sync_with_master;

SELECT * FROM test.t1;

SELECT * FROM test.t2;

SELECT * FROM test.t1 ORDER BY a;

SELECT * FROM test.t2 ORDER BY a;

#SELECT * FROM test.t3;



--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql