diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-18 05:16:39 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-18 05:16:39 +0300 |
| commit | 01eab0ce84a3f8cef702d9673cc6f6262f4a5a7a (patch) | |
| tree | bec809e08634f934190434f5e22828676c8b9dfe /mysql-test | |
| parent | d8ae9669cd11f9c61105a9cbf19f9318a0e783fc (diff) | |
| download | mariadb-git-01eab0ce84a3f8cef702d9673cc6f6262f4a5a7a.tar.gz | |
Fix error messages
Configure fixes
configure.in:
Fix for pstack
libmysqld/Makefile.am:
Fix to create examples
mysql-test/t/drop.test:
Fix error messages
mysql-test/t/isolation.test:
Fix error messages
mysql-test/t/union.test:
Fix error messages
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/drop.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/isolation.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 14 |
3 files changed, 11 insertions, 10 deletions
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test index 50a33762776..38323f5958d 100644 --- a/mysql-test/t/drop.test +++ b/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; diff --git a/mysql-test/t/isolation.test b/mysql-test/t/isolation.test index d9750ecb351..2a1a0ee79be 100644 --- a/mysql-test/t/isolation.test +++ b/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; diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index e780e9ec528..a4a29c76e65 100644 --- a/mysql-test/t/union.test +++ b/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 |