Commit 10370a19 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 c5bd6daf 20424291

mysql-test/r/rpl_row_drop.result

+0 −6
Original line number Diff line number Diff line
@@ -41,12 +41,6 @@ t1 
t2

**** On Master ****

DROP TABLE t1,t2;

SHOW BINLOG EVENTS;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	102	Server ver: VERSION, Binlog ver: 4

master-bin.000001	102	Query	1	188	use `test`; CREATE TABLE t1 (a int)

master-bin.000001	188	Query	1	274	use `test`; CREATE TABLE t2 (a int)

master-bin.000001	274	Query	1	378	use `test`; DROP TABLE `t1` /* generated by server */

SHOW TABLES;

Tables_in_test

t2

mysql-test/r/rpl_row_sp010.result

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ INSERT INTO test.t1 VALUES(1); 
CALL test.p1();

END|

CALL test.p2();

SELECT * FROM test.t1;

SELECT * FROM test.t1 ORDER BY a;

a

1

2
@@ -40,11 +40,11 @@ INSERT INTO test.t2 VALUES(6); 
CALL test.p3();

END|

CALL test.p4();

SELECT * FROM test.t2;

SELECT * FROM test.t2 ORDER BY a;

a

6

7

SELECT * FROM test.t2;

SELECT * FROM test.t2 ORDER BY a;

a

6

7

mysql-test/t/disabled.def

+3 −2
Original line number Diff line number Diff line
@@ -24,16 +24,17 @@ rpl_bit_npk : Bug#13418 
rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly

rpl_ndb_auto_inc        : Bug#17086

rpl_ndb_basic           : Bug#16228 [IN REVIEW]

rpl_ndb_blob            : Bug #17505

rpl_ndb_blob2           : Bug #17505

rpl_ndb_charset         : Bug#17246

rpl_ndb_ddl             : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296

#rpl_ndb_log            : result not deterministic

rpl_ndb_log             : result not deterministic

rpl_ndb_relay_space     : Bug#16993

rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_sp007           : Bug #17290

rpl_sp                  : Bug#16456

rpl_until               : Unstable test case, bug#15886

sp-goto                 : GOTO is currently is disabled - will be fixed in the future

rpl_ndb_log             : results are not deterministic

mysqldump               : Bug#17443 mysqlimport --use-threads=5 gives crashes

mysql-test/t/rpl_row_drop.test

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ connection master; 
# Should drop the non-temporary table t1 and the temporary table t2

DROP TABLE t1,t2;

let $VERSION=`select version()`;

--replace_result $VERSION VERSION

SHOW BINLOG EVENTS;

#--replace_result $VERSION VERSION

#SHOW BINLOG EVENTS;

SHOW TABLES;

sync_slave_with_master;

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

mysql-test/t/rpl_row_sp010.test

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ BEGIN 
END|

delimiter ;|

CALL test.p2();

SELECT * FROM test.t1;

SELECT * FROM test.t1 ORDER BY a;



save_master_pos;

connection slave;
@@ -59,12 +59,12 @@ BEGIN 
END|

delimiter ;|

CALL test.p4();

SELECT * FROM test.t2;

SELECT * FROM test.t2 ORDER BY a;



save_master_pos;

connection slave;

sync_with_master;

SELECT * FROM test.t2;

SELECT * FROM test.t2 ORDER BY a;



# Cleanup

connection master;