diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-08 20:18:37 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-08 20:18:37 -0600 |
| commit | a64d1ddfcc7a1261b0b8bafcbf793c5a9ef9c91a (patch) | |
| tree | 4ce5a639342bbc1f9b12c3c8f0d4ce5e77cfbb6f /mysql-test/r | |
| parent | 9820d3bd7ce6b671ef9c2cae15457d28a520b45b (diff) | |
| download | mariadb-git-a64d1ddfcc7a1261b0b8bafcbf793c5a9ef9c91a.tar.gz | |
fixed error messages
mysql-test/r/drop.result:
error msg fix
mysql-test/r/err000001.result:
error msg fix
mysql-test/r/innodb.result:
error msg fix
mysql-test/r/overflow.result:
error msg fix
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/drop.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/err000001.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/overflow.result | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result index e8bc7486369..7c1b7c5b60d 100644 --- a/mysql-test/r/drop.result +++ b/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; diff --git a/mysql-test/r/err000001.result b/mysql-test/r/err000001.result index 2cfd34f068a..5afecc6d600 100644 --- a/mysql-test/r/err000001.result +++ b/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; diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index c96ce4e5e33..596edb84705 100644 --- a/mysql-test/r/innodb.result +++ b/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 diff --git a/mysql-test/r/overflow.result b/mysql-test/r/overflow.result index ac857513d01..a5fa7154833 100644 --- a/mysql-test/r/overflow.result +++ b/mysql-test/r/overflow.result @@ -1,2 +1,2 @@ drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA; -Incorrect database name 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' +Got one of the listed errors |