bk commit into 5.1 tree (mats:1.2336)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-08 13:55:33+01:00, mats@romeo.(none) +2 -0
  Fixes to make rpl_ndb_dd_advance pass.

  mysql-test/r/rpl_ndb_dd_advance.result@stripped, 2006-11-08 13:55:29+01:00, mats@romeo.(none) +8 -8
    Result change.

  mysql-test/t/rpl_ndb_dd_advance.test@stripped, 2006-11-08 13:55:30+01:00, mats@romeo.(none) +8 -8
    Dropping procedure on slave and then dropping the procedure on master and
    replicating the drop causes failure since the procedure does not exist.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b18581-mysql-5.1-new-rpl

--- 1.7/mysql-test/r/rpl_ndb_dd_advance.result	2006-11-08 13:55:41 +01:00
+++ 1.8/mysql-test/r/rpl_ndb_dd_advance.result	2006-11-08 13:55:41 +01:00
@@ -326,12 +326,12 @@
 **** 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 @@
 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;

--- 1.7/mysql-test/t/rpl_ndb_dd_advance.test	2006-11-08 13:55:41 +01:00
+++ 1.8/mysql-test/t/rpl_ndb_dd_advance.test	2006-11-08 13:55:41 +01:00
@@ -385,12 +385,12 @@
 --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 @@
 
 --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;