diff options
| author | unknown <serg@serg.mylan> | 2003-11-18 10:23:49 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-11-18 10:23:49 +0100 |
| commit | 5a24433d271e6317886102448f2b60728b738940 (patch) | |
| tree | 89d4a1ac4663bd62954142074197be3a54b27ee5 /mysql-test | |
| parent | cf192616699b0d562f600552397c9e5bc4ee74e8 (diff) | |
| download | mariadb-git-5a24433d271e6317886102448f2b60728b738940.tar.gz | |
word substitution in error messages removed - can create problems for i18n
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/query_cache.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/overflow.test | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index e91153cae15..b00680f0cbb 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -586,7 +586,7 @@ select * from t1; a set GLOBAL query_cache_size=1024; Warnings: -Warning 1285 Query cache failed to set size 1024, new query cache size is 0 +Warning 1284 Query cache failed to set size 1024, new query cache size is 0 show global variables like "query_cache_size"; Variable_name Value query_cache_size 0 @@ -594,7 +594,7 @@ select * from t1; a set GLOBAL query_cache_size=10240; Warnings: -Warning 1285 Query cache failed to set size 10240, new query cache size is 0 +Warning 1284 Query cache failed to set size 10240, new query cache size is 0 show global variables like "query_cache_size"; Variable_name Value query_cache_size 0 @@ -602,7 +602,7 @@ select * from t1; a set GLOBAL query_cache_size=20480; Warnings: -Warning 1285 Query cache failed to set size 20480, new query cache size is 0 +Warning 1284 Query cache failed to set size 20480, new query cache size is 0 show global variables like "query_cache_size"; Variable_name Value query_cache_size 0 @@ -610,7 +610,7 @@ select * from t1; a set GLOBAL query_cache_size=40960; Warnings: -Warning 1285 Query cache failed to set size 40960, new query cache size is 0 +Warning 1284 Query cache failed to set size 40960, new query cache size is 0 show global variables like "query_cache_size"; Variable_name Value query_cache_size 0 diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index cec7dd17e6d..5d61d7b18f2 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -70,9 +70,9 @@ drop database test_$1; create table `` (a int); --error 1279 drop table if exists ``; ---error 1279 +--error 1281 create table t1 (`` int); ---error 1279 +--error 1282 create table t1 (i int, index `` (i)); # diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index 3aace91447d..bc0afd53d6f 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -133,9 +133,9 @@ select * from t2 having MATCH inhalt AGAINST ('foobar'); # check of fulltext errors # ---error 1286 +--error 1285 CREATE TABLE t3 (t int(11),i text,fulltext tix (t,i)); ---error 1286 +--error 1285 CREATE TABLE t3 (t int(11),i text, j varchar(200) CHARACTER SET latin2, fulltext tix (i,j)); diff --git a/mysql-test/t/overflow.test b/mysql-test/t/overflow.test index 7a9616fd24e..17e443d51f8 100644 --- a/mysql-test/t/overflow.test +++ b/mysql-test/t/overflow.test @@ -1,4 +1,4 @@ connect (con1,localhost,boo,,); connection con1; --- error 1064,1102,1279 +-- error 1064,1102,1280 drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA; |