summaryrefslogtreecommitdiff
path: root/mysql-test/include/rpl_multi_engine.inc
diff options
context:
space:
mode:
authorHe Zhenxing <zhenxing.he@sun.com>2008-11-24 14:57:23 +0800
committerHe Zhenxing <zhenxing.he@sun.com>2008-11-24 14:57:23 +0800
commit5676a2d770d79b2f22242c5d4c18e5fd0e1a1df9 (patch)
treed84da1b3bbd4a62e011cbfd6eadd6abaca05268f /mysql-test/include/rpl_multi_engine.inc
parentab0e404c73557f8a81764eb6ee0fd3d1db08e381 (diff)
downloadmariadb-git-5676a2d770d79b2f22242c5d4c18e5fd0e1a1df9.tar.gz
BUG#40707 rpl_multi_engine fails sporadically in pushbuild
If before running test rpl_mulit_engin, the mysqltest1 database exists on master but not exists on slave, then the following statement: create database if not exists mysqltest1; would not be logged to binary log, and so the database would not be created on slave. This would cause the test to fail and reporting mysqltest1 database not existed on slave. This patch fixed this problem by not using a different database for the whole test, just use the default test database, there is no reason why a seperate database is used for this test. mysql-test/include/rpl_multi_engine.inc: use default test database instead of mysqltest1 mysql-test/suite/rpl/r/rpl_multi_engine.result: use default test database instead of mysqltest1 mysql-test/suite/rpl/t/rpl_multi_engine.test: use default test database instead of mysqltest1 add missing --enable_warnings
Diffstat (limited to 'mysql-test/include/rpl_multi_engine.inc')
-rw-r--r--mysql-test/include/rpl_multi_engine.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/rpl_multi_engine.inc b/mysql-test/include/rpl_multi_engine.inc
index f2c837ef90b..b2d1a9c1cef 100644
--- a/mysql-test/include/rpl_multi_engine.inc
+++ b/mysql-test/include/rpl_multi_engine.inc
@@ -9,7 +9,7 @@ select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
sync_slave_with_master;
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
connection master;
-DELETE FROM mysqltest1.t1 WHERE id = 42;
+DELETE FROM t1 WHERE id = 42;
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
sync_slave_with_master;
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;