1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
This commit is contained in:
unknown 2006-11-08 14:07:13 +01:00
commit 7b3e547c69
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/r/rpl_ndb_dd_advance.result
View File

@ -326,12 +326,12 @@ COUNT(*)
**** Must make sure slave is clean ***** **** Must make sure slave is clean *****
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
DROP PROCEDURE tpcb.load; DROP PROCEDURE IF EXISTS tpcb.load;
DROP PROCEDURE tpcb.trans; DROP PROCEDURE IF EXISTS tpcb.trans;
DROP TABLE tpcb.account; DROP TABLE IF EXISTS tpcb.account;
DROP TABLE tpcb.teller; DROP TABLE IF EXISTS tpcb.teller;
DROP TABLE tpcb.branch; DROP TABLE IF EXISTS tpcb.branch;
DROP TABLE tpcb.history; DROP TABLE IF EXISTS tpcb.history;
DROP DATABASE tpcb; DROP DATABASE tpcb;
ALTER TABLESPACE ts1 ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' DROP DATAFILE 'datafile.dat'
@ -392,8 +392,8 @@ COUNT(*)
4050 4050
*** DUMP MASTER & SLAVE FOR COMPARE ******** *** DUMP MASTER & SLAVE FOR COMPARE ********
*************** TEST 2 CLEANUP SECTION ******************** *************** TEST 2 CLEANUP SECTION ********************
DROP PROCEDURE tpcb.load; DROP PROCEDURE IF EXISTS tpcb.load;
DROP PROCEDURE tpcb.trans; DROP PROCEDURE IF EXISTS tpcb.trans;
DROP TABLE tpcb.account; DROP TABLE tpcb.account;
DROP TABLE tpcb.teller; DROP TABLE tpcb.teller;
DROP TABLE tpcb.branch; DROP TABLE tpcb.branch;

16
mysql-test/t/rpl_ndb_dd_advance.test
View File

@ -385,12 +385,12 @@ while ($j)
--connection slave --connection slave
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
DROP PROCEDURE tpcb.load; DROP PROCEDURE IF EXISTS tpcb.load;
DROP PROCEDURE tpcb.trans; DROP PROCEDURE IF EXISTS tpcb.trans;
DROP TABLE tpcb.account; DROP TABLE IF EXISTS tpcb.account;
DROP TABLE tpcb.teller; DROP TABLE IF EXISTS tpcb.teller;
DROP TABLE tpcb.branch; DROP TABLE IF EXISTS tpcb.branch;
DROP TABLE tpcb.history; DROP TABLE IF EXISTS tpcb.history;
DROP DATABASE tpcb; DROP DATABASE tpcb;
ALTER TABLESPACE ts1 ALTER TABLESPACE ts1
@ -534,8 +534,8 @@ SELECT COUNT(*) FROM history;
--echo *************** TEST 2 CLEANUP SECTION ******************** --echo *************** TEST 2 CLEANUP SECTION ********************
connection master; connection master;
DROP PROCEDURE tpcb.load; DROP PROCEDURE IF EXISTS tpcb.load;
DROP PROCEDURE tpcb.trans; DROP PROCEDURE IF EXISTS tpcb.trans;
DROP TABLE tpcb.account; DROP TABLE tpcb.account;
DROP TABLE tpcb.teller; DROP TABLE tpcb.teller;
DROP TABLE tpcb.branch; DROP TABLE tpcb.branch;