Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

mysql-test/t/drop.test

@@ -28,13 +28,13 @@ drop database foo;
 # test drop/create database and FLUSH TABLES WITH READ LOCK
 drop database if exists foo;
 flush tables with read lock;
---error 1209,1218;
+--error 1209,1219;
 create database foo;
 unlock tables;
 create database foo;
 show databases;
 flush tables with read lock;
---error 1208,1218;
+--error 1208,1219;
 drop database foo;
 unlock tables;
 drop database foo;

mysql-test/t/isolation.test

@@ -16,7 +16,8 @@ create table t1 (f1 char(20) not null) type = gemini;
 insert into t1 (f1) values ("test2"), ("bar");
 connection master1;
 set transaction isolation level serializable;
-!$-1217 select * from t1;
+--error 1218
+select * from t1;
 connection master;
 commit;
 

mysql-test/t/union.test

@@ -19,25 +19,25 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g
 # Test some error conditions with UNION
 explain select a,b from t1 union all select a,b from t2;
 
---error 1216
+--error 1217
 select a,b from t1 into outfile 'skr' union select a,b from t2;
 
---error 1216
+--error 1217
 select a,b from t1 order by a union select a,b from t2;
 
---error 1216
+--error 1217
 insert into t3 select a from t1 order by a union select a from t2;
 
---error 1217
+--error 1218
 create table t3 select a,b from t1 union select a from t2;
 
---error 1217
+--error 1218
 select a,b from t1 union select a from t2;
 
---error 1217
+--error 1218
 select * from t1 union select a from t2;
 
---error 1217
+--error 1218
 select a from t1 union select * from t2;
 
 # Test CREATE, INSERT and REPLACE