summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <mats@romeo.(none)>2006-11-08 13:55:33 +0100
committerunknown <mats@romeo.(none)>2006-11-08 13:55:33 +0100
commite4017107bc58e789d2f92394eac026d97f97a8e9 (patch)
tree8048df62eb3eff45ba54a77634a2f55ca61b6687 /mysql-test/r
parent4c3283b3b306fc4f9ede3ef3bd8244d45a9b4fac (diff)
downloadmariadb-git-e4017107bc58e789d2f92394eac026d97f97a8e9.tar.gz
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.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/rpl_ndb_dd_advance.result16
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/rpl_ndb_dd_advance.result b/mysql-test/r/rpl_ndb_dd_advance.result
index bbc67a04027..b29d1201a85 100644
--- a/mysql-test/r/rpl_ndb_dd_advance.result
+++ b/mysql-test/r/rpl_ndb_dd_advance.result
@@ -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;