diff options
| author | mats@kindahl-laptop.dnsalias.net <> | 2007-05-27 22:20:01 +0200 |
|---|---|---|
| committer | mats@kindahl-laptop.dnsalias.net <> | 2007-05-27 22:20:01 +0200 |
| commit | 2aab5fef61569e95e4ee67775564fbca84a0b9ba (patch) | |
| tree | 7ab7c24d87e01106a68f8723f38ec1d2fb8bb8a2 /mysql-test | |
| parent | 6a7925a262bbe4ab37a90a952330b3b411bc2df5 (diff) | |
| download | mariadb-git-2aab5fef61569e95e4ee67775564fbca84a0b9ba.tar.gz | |
WL#3339 (Issue warnings when statement-based replication may fail):
Fixing case where a false warning could be printed in mixed mode.
Also fixing some test cases that generated different result files as
a consequence of the patch.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/check.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/check.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/func_misc.test | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/check.result b/mysql-test/r/check.result index 60806e7393e..739eab2ed76 100644 --- a/mysql-test/r/check.result +++ b/mysql-test/r/check.result @@ -1,4 +1,5 @@ -drop table if exists t1; +drop table if exists t1,t2; +drop view if exists v1; create table t1(n int not null, key(n), key(n), key(n), key(n)); check table t1 extended; insert into t1 values (200000); diff --git a/mysql-test/t/check.test b/mysql-test/t/check.test index 8d9d70bd29a..eb72d75da3c 100644 --- a/mysql-test/t/check.test +++ b/mysql-test/t/check.test @@ -2,7 +2,8 @@ connect (con1,localhost,root,,); connect (con2,localhost,root,,); connection con1; --disable_warnings -drop table if exists t1; +drop table if exists t1,t2; +drop view if exists v1; --enable_warnings # Add a lot of keys to slow down check diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index 8ff62f68e45..23b8db607b8 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -89,7 +89,9 @@ select export_set(3, _latin1'foo', _utf8'bar', ',', 4); # # Test for BUG#9535 # +--disable_warnings create table t1 as select uuid(), length(uuid()); +--enable_warnings show create table t1; drop table t1; |