Post-merge fixes

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;

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;