Commit 7b3e547c authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
parents 3763edd3 e4017107

mysql-test/r/rpl_ndb_dd_advance.result

+8 −8
Original line number Diff line number Diff line
@@ -326,12 +326,12 @@ COUNT(*) 
**** Must make sure slave is clean *****

STOP SLAVE;

RESET SLAVE;

DROP PROCEDURE tpcb.load;

DROP PROCEDURE tpcb.trans;

DROP TABLE tpcb.account;

DROP TABLE tpcb.teller;

DROP TABLE tpcb.branch;

DROP TABLE tpcb.history;

DROP PROCEDURE IF EXISTS tpcb.load;

DROP PROCEDURE IF EXISTS tpcb.trans;

DROP TABLE IF EXISTS tpcb.account;

DROP TABLE IF EXISTS tpcb.teller;

DROP TABLE IF EXISTS tpcb.branch;

DROP TABLE IF EXISTS tpcb.history;

DROP DATABASE tpcb;

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile.dat'
@@ -392,8 +392,8 @@ COUNT(*) 
4050

*** DUMP MASTER & SLAVE FOR COMPARE ********

*************** TEST 2 CLEANUP SECTION ********************

DROP PROCEDURE tpcb.load;

DROP PROCEDURE tpcb.trans;

DROP PROCEDURE IF EXISTS tpcb.load;

DROP PROCEDURE IF EXISTS tpcb.trans;

DROP TABLE tpcb.account;

DROP TABLE tpcb.teller;

DROP TABLE tpcb.branch;

mysql-test/t/rpl_ndb_dd_advance.test

+8 −8
Original line number Diff line number Diff line
@@ -385,12 +385,12 @@ while ($j) 
--connection slave

STOP SLAVE;

RESET SLAVE;

DROP PROCEDURE tpcb.load;

DROP PROCEDURE tpcb.trans;

DROP TABLE tpcb.account;

DROP TABLE tpcb.teller;

DROP TABLE tpcb.branch;

DROP TABLE tpcb.history;

DROP PROCEDURE IF EXISTS tpcb.load;

DROP PROCEDURE IF EXISTS tpcb.trans;

DROP TABLE IF EXISTS tpcb.account;

DROP TABLE IF EXISTS tpcb.teller;

DROP TABLE IF EXISTS tpcb.branch;

DROP TABLE IF EXISTS tpcb.history;

DROP DATABASE tpcb;



ALTER TABLESPACE ts1
@@ -534,8 +534,8 @@ SELECT COUNT(*) FROM history; 


--echo *************** TEST 2 CLEANUP SECTION ********************

connection master;

DROP PROCEDURE tpcb.load;

DROP PROCEDURE tpcb.trans;

DROP PROCEDURE IF EXISTS tpcb.load;

DROP PROCEDURE IF EXISTS tpcb.trans;

DROP TABLE tpcb.account;

DROP TABLE tpcb.teller;

DROP TABLE tpcb.branch;