fixed error messages

mysql-test/r/drop.result

@@ -27,7 +27,7 @@ drop database foo;
 drop database if exists foo;
 flush tables with read lock;
 create database foo;
-Can't execute the query because you have a conflicting read lock
+Got one of the listed errors
 unlock tables;
 create database foo;
 show databases;
@@ -37,7 +37,7 @@ mysql
 test
 flush tables with read lock;
 drop database foo;
-Can't execute the query because you have a conflicting read lock
+Got one of the listed errors
 unlock tables;
 drop database foo;
 show databases;

mysql-test/r/err000001.result

@@ -13,7 +13,7 @@ Unknown table 'not_existing_database' in field list
 select count(not_existing_database.t1.a) from t1;
 Unknown table 'not_existing_database.t1' in field list
 select count(not_existing_database.t1.a) from not_existing_database.t1;
-Table 'not_existing_database.t1' doesn't exist
+Got one of the listed errors
 select 1 from t1 order by 2;
 Unknown column '2' in 'order clause'
 select 1 from t1 group by 2;

mysql-test/r/innodb.result

@@ -48,7 +48,7 @@ id	parent_id	level
 15	102	2
 update t1 set id=id+1000;
 update t1 set id=1024 where id=1009;
-Duplicate entry '1024' for key 1
+Got one of the listed errors
 select * from t1;
 id	parent_id	level
 1001	100	0

mysql-test/r/overflow.result

 drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
-Incorrect database name 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+Got one of the listed errors