summaryrefslogtreecommitdiff
path: root/mysql-test/t/multi_update.test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-01-03 21:14:20 +0200
committerunknown <monty@mysql.com>2005-01-03 21:14:20 +0200
commitcae189b15e3b7a58b8f578456b9ea0b9fc2b8282 (patch)
tree87d4c4880a7ff568e8abb8dfc753f0902996eca9 /mysql-test/t/multi_update.test
parenta8341f1b7763596322e5402a0c382d012c3afa1c (diff)
parentc8cfe3d211366b353eaefe47a78817508d3dac9a (diff)
downloadmariadb-git-cae189b15e3b7a58b8f578456b9ea0b9fc2b8282.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1 mysql-test/t/multi_update.test: Auto merged
Diffstat (limited to 'mysql-test/t/multi_update.test')
-rw-r--r--mysql-test/t/multi_update.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index 4e42ecc041d..4a7367a333c 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;