Fixes to make rpl_ndb_dd_advance pass.
mysql-test/r/rpl_ndb_dd_advance.result: Result change. mysql-test/t/rpl_ndb_dd_advance.test: Dropping procedure on slave and then dropping the procedure on master and replicating the drop causes failure since the procedure does not exist.
This commit is contained in:
parent
4c3283b3b3
commit
e4017107bc
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user