bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-10-08 20:18:37-06:00, sasha@stripped
  fixed error messages

  mysql-test/r/drop.result
    1.7 01/10/08 20:18:36 sasha@stripped +2 -2
    error msg fix

  mysql-test/r/err000001.result
    1.2 01/10/08 20:18:36 sasha@stripped +1 -1
    error msg fix

  mysql-test/r/innodb.result
    1.17 01/10/08 20:18:36 sasha@stripped +1 -1
    error msg fix

  mysql-test/r/overflow.result
    1.2 01/10/08 20:18:36 sasha@stripped +1 -1
    error msg fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.16/mysql-test/r/innodb.result	Thu Oct  4 15:42:16 2001
+++ 1.17/mysql-test/r/innodb.result	Mon Oct  8 20:18:36 2001
@@ -48,7 +48,7 @@
 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

--- 1.6/mysql-test/r/drop.result	Thu Sep 27 23:05:47 2001
+++ 1.7/mysql-test/r/drop.result	Mon Oct  8 20:18:36 2001
@@ -27,7 +27,7 @@
 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 @@
 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;

--- 1.1/mysql-test/r/err000001.result	Thu Sep 27 23:05:51 2001
+++ 1.2/mysql-test/r/err000001.result	Mon Oct  8 20:18:36 2001
@@ -13,7 +13,7 @@
 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;

--- 1.1/mysql-test/r/overflow.result	Thu Sep 27 23:05:51 2001
+++ 1.2/mysql-test/r/overflow.result	Mon Oct  8 20:18:36 2001
@@ -1,2 +1,2 @@
 drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
-Incorrect database name 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+Got one of the listed errors