diff options
| author | unknown <sergefp@mysql.com> | 2004-12-11 16:36:12 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-12-11 16:36:12 +0300 |
| commit | 0a3590f6d08342512deecfe15e91424eb01c0be4 (patch) | |
| tree | b4b6858598271a7887f436482353a26b6ffd5e0c | |
| parent | c77391b94fd94dd094b40035177fcaa678c9f3ee (diff) | |
| download | mariadb-git-0a3590f6d08342512deecfe15e91424eb01c0be4.tar.gz | |
Post-merge fixes
| -rw-r--r-- | mysql-test/r/multi_update.result | 13 | ||||
| -rw-r--r-- | mysql-test/t/multi_update.test | 14 |
2 files changed, 19 insertions, 8 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 75a7c3e5a0c..dba10296063 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -464,9 +464,14 @@ ERROR HY000: You can't specify target table 't1' for update in FROM clause delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1; ERROR HY000: You can't specify target table 't1' for update in FROM clause drop table t1,t2; -drop table if exists t2, t1; -create table t1(aclid bigint not null primary key, status tinyint(1) not null ) type = innodb; -create table t2(refid bigint not null primary key, aclid bigint, index idx_acl(aclid) )type = innodb; +create table t1 ( +aclid bigint not null primary key, +status tinyint(1) not null +) engine = innodb; +create table t2 ( +refid bigint not null primary key, +aclid bigint, index idx_acl(aclid) +) engine = innodb; insert into t2 values(1,null); -delete t2, t1 from t2 as a left join t1 as b on (a.aclid=b.aclid) where a.refid='1'; +delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1'; drop table t1, t2; diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 005ce74db83..e90de399500 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -433,10 +433,16 @@ 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 -drop table if exists t2, t1; -create table t1(aclid bigint not null primary key, status tinyint(1) not null ) type = innodb; -create table t2(refid bigint not null primary key, aclid bigint, index idx_acl(aclid) )type = innodb; +create table t1 ( + aclid bigint not null primary key, + status tinyint(1) not null +) engine = innodb; + +create table t2 ( + refid bigint not null primary key, + aclid bigint, index idx_acl(aclid) +) engine = innodb; insert into t2 values(1,null); -delete t2, t1 from t2 as a left join t1 as b on (a.aclid=b.aclid) where a.refid='1'; +delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1'; drop table t1, t2; |