diff options
| author | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2004-12-31 11:52:14 +0100 |
| commit | 5eaf65ab4be77911eb03cceefac9ecea48c25f71 (patch) | |
| tree | e4e588771f15003e0c2b5df5cbc1cafeb3530324 /mysql-test/t/multi_update.test | |
| parent | 379613c3e274147f240a25b10eb677e3ee77aa34 (diff) | |
| download | mariadb-git-5eaf65ab4be77911eb03cceefac9ecea48c25f71.tar.gz | |
post-merge
mysql-test/r/grant2.result:
new test case
mysql-test/r/variables.result:
don't fail w/o innodb
mysql-test/t/grant2.test:
new test case
mysql-test/t/multi_update.test:
don't fail w/o innodb
mysql-test/t/variables.test:
don't fail w/o innodb
sql/sql_acl.cc:
cleanup
Diffstat (limited to 'mysql-test/t/multi_update.test')
| -rw-r--r-- | mysql-test/t/multi_update.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index e90de399500..4035099ec7e 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -433,6 +433,7 @@ delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2 drop table t1,t2; # Test for BUG#5837 - delete with outer join and const tables +--disable_warnings create table t1 ( aclid bigint not null primary key, status tinyint(1) not null @@ -442,6 +443,7 @@ create table t2 ( refid bigint not null primary key, aclid bigint, index idx_acl(aclid) ) engine = innodb; +--enable_warnings insert into t2 values(1,null); delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1'; drop table t1, t2; |