diff options
author | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:07:51 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:07:51 +0200 |
commit | db47e4ca2479a8e7bde91757fa968c462ca2a343 (patch) | |
tree | ec47c385448c97b6f07f4d2851b745236f7e98dd /mysql-test/t/rpl000009.test | |
parent | f2564f616cc566be748e549e3182ce1485442db1 (diff) | |
download | mariadb-git-db47e4ca2479a8e7bde91757fa968c462ca2a343.tar.gz |
Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
mysql-test/r/rpl000009.result:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
mysql-test/t/rpl000009.test:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
sql/item_create.cc:
Added timeout for wait_for_master_pos
sql/item_create.h:
Added timeout for wait_for_master_pos
sql/item_func.cc:
Added timeout for wait_for_master_pos
sql/item_func.h:
Added timeout for wait_for_master_pos
sql/lex.h:
Added timeout for wait_for_master_pos
sql/slave.h:
Added timeout for wait_for_master_pos
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_parse.cc:
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_repl.cc:
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Diffstat (limited to 'mysql-test/t/rpl000009.test')
-rw-r--r-- | mysql-test/t/rpl000009.test | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test index 3d0827718ec..5f55355271a 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl000009.test @@ -9,6 +9,7 @@ create database bar; save_master_pos; connection slave; sync_with_master; +create database foo; drop table if exists foo.foo; create table foo.foo (n int); insert into foo.foo values(4); @@ -24,13 +25,14 @@ connection slave; sync_with_master; select foo.foo.n,bar.bar.m from foo.foo,bar.bar; connection master; -drop database if exists bar; +drop database bar; drop database if exists foo; save_master_pos; connection slave; sync_with_master; -drop database if exists bar; -drop database if exists foo; +--error 1008 +drop database bar; +drop database foo; # Now let's test load data from master |