Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/psergey/mysql-4.0

mysql-test/r/multi_update.result

@@ -336,7 +336,7 @@ alter table t1 add b char(8) not null;
 alter table t1 add a char(8) not null;
 alter table t1 add primary key (a,b,c);
 update t1 set a=c, b=c;
-create table t2 like t1;
+create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c));
 insert into t2 select * from t1;
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
 drop table t1,t2;
@@ -348,7 +348,7 @@ alter table t1 add b char(8) not null;
 alter table t1 add a char(8) not null;
 alter table t1 add primary key (a,b,c);
 update t1 set a=c, b=c;
-create table t2 like t1;
+create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c));
 insert into t2 select * from t1;
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
 set @@table_type=@ttype_save;

mysql-test/t/multi_update.test

@@ -286,7 +286,7 @@ alter table t1 add a char(8) not null;
 alter table t1 add primary key (a,b,c);
 update t1 set a=c, b=c;
 
-create table t2 like t1;
+create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c));
 insert into t2 select * from t1;
 
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
@@ -306,7 +306,7 @@ alter table t1 add a char(8) not null;
 alter table t1 add primary key (a,b,c);
 update t1 set a=c, b=c;
 
-create table t2 like t1;
+create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c));
 insert into t2 select * from t1;
 
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;