1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better

Browse Source
This commit is contained in:
Sergei Golubchik 2009-12-22 12:02:52 +01:00
parent 1ad5bb1a69
commit bb865442a4
14 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/create.result
View File

@ -228,7 +228,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MEMORY DEFAULT CHARSET=latin1 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
drop table t1; drop table t1;
SET SESSION storage_engine="gemini"; SET SESSION storage_engine="gemini";
ERROR 42000: Unknown table engine 'gemini' ERROR 42000: Unknown storage engine 'gemini'
SELECT @@storage_engine; SELECT @@storage_engine;
@@storage_engine @@storage_engine
MEMORY MEMORY
@ -389,7 +389,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MEMORY DEFAULT CHARSET=latin1 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
drop table t1; drop table t1;
SET SESSION storage_engine="gemini"; SET SESSION storage_engine="gemini";
ERROR 42000: Unknown table engine 'gemini' ERROR 42000: Unknown storage engine 'gemini'
SELECT @@storage_engine; SELECT @@storage_engine;
@@storage_engine @@storage_engine
MEMORY MEMORY

2
mysql-test/r/log_tables.result
View File

@ -249,7 +249,7 @@ set @save_storage_engine= @@session.storage_engine;
set storage_engine= MEMORY; set storage_engine= MEMORY;
alter table mysql.slow_log engine=NonExistentEngine; alter table mysql.slow_log engine=NonExistentEngine;
Warnings: Warnings:
Warning 1286 Unknown table engine 'NonExistentEngine' Warning 1286 Unknown storage engine 'NonExistentEngine'
alter table mysql.slow_log engine=memory; alter table mysql.slow_log engine=memory;
ERROR HY000: This storage engine cannot be used for log tables" ERROR HY000: This storage engine cannot be used for log tables"
set storage_engine= @save_storage_engine; set storage_engine= @save_storage_engine;

4
mysql-test/r/mysql.result
View File

@ -397,9 +397,9 @@ WARNING: --server-arg option not supported in this configuration.
+---+ +---+
| 1 | | 1 |
+---+ +---+
Warning (Code 1286): Unknown table engine 'nonexistent' Warning (Code 1286): Unknown storage engine 'nonexistent'
Warning (Code 1266): Using storage engine MyISAM for table 't2' Warning (Code 1266): Using storage engine MyISAM for table 't2'
Warning (Code 1286): Unknown table engine 'nonexistent2' Warning (Code 1286): Unknown storage engine 'nonexistent2'
Warning (Code 1266): Using storage engine MyISAM for table 't2' Warning (Code 1266): Using storage engine MyISAM for table 't2'
Error (Code 1050): Table 't2' already exists Error (Code 1050): Table 't2' already exists
drop tables t1, t2; drop tables t1, t2;

26
mysql-test/r/not_partition.result
View File

@ -1,47 +1,47 @@
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
FLUSH TABLES; FLUSH TABLES;
SELECT * FROM t1; SELECT * FROM t1;
ERROR 42000: Unknown table engine 'partition' ERROR 42000: Unknown storage engine 'partition'
TRUNCATE TABLE t1; TRUNCATE TABLE t1;
ERROR 42000: Unknown table engine 'partition' ERROR 42000: Unknown storage engine 'partition'
ANALYZE TABLE t1; ANALYZE TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze Error Unknown table engine 'partition' test.t1 analyze Error Unknown storage engine 'partition'
test.t1 analyze error Corrupt test.t1 analyze error Corrupt
CHECK TABLE t1; CHECK TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check Error Unknown table engine 'partition' test.t1 check Error Unknown storage engine 'partition'
test.t1 check error Corrupt test.t1 check error Corrupt
OPTIMIZE TABLE t1; OPTIMIZE TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize Error Unknown table engine 'partition' test.t1 optimize Error Unknown storage engine 'partition'
test.t1 optimize error Corrupt test.t1 optimize error Corrupt
REPAIR TABLE t1; REPAIR TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair Error Unknown table engine 'partition' test.t1 repair Error Unknown storage engine 'partition'
test.t1 repair error Corrupt test.t1 repair error Corrupt
ALTER TABLE t1 REPAIR PARTITION ALL; ALTER TABLE t1 REPAIR PARTITION ALL;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair Error Unknown table engine 'partition' test.t1 repair Error Unknown storage engine 'partition'
test.t1 repair error Corrupt test.t1 repair error Corrupt
ALTER TABLE t1 CHECK PARTITION ALL; ALTER TABLE t1 CHECK PARTITION ALL;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check Error Unknown table engine 'partition' test.t1 check Error Unknown storage engine 'partition'
test.t1 check error Corrupt test.t1 check error Corrupt
ALTER TABLE t1 OPTIMIZE PARTITION ALL; ALTER TABLE t1 OPTIMIZE PARTITION ALL;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize Error Unknown table engine 'partition' test.t1 optimize Error Unknown storage engine 'partition'
test.t1 optimize error Corrupt test.t1 optimize error Corrupt
ALTER TABLE t1 ANALYZE PARTITION ALL; ALTER TABLE t1 ANALYZE PARTITION ALL;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze Error Unknown table engine 'partition' test.t1 analyze Error Unknown storage engine 'partition'
test.t1 analyze error Corrupt test.t1 analyze error Corrupt
ALTER TABLE t1 REBUILD PARTITION ALL; ALTER TABLE t1 REBUILD PARTITION ALL;
ERROR 42000: Unknown table engine 'partition' ERROR 42000: Unknown storage engine 'partition'
ALTER TABLE t1 ENGINE Memory; ALTER TABLE t1 ENGINE Memory;
ERROR 42000: Unknown table engine 'partition' ERROR 42000: Unknown storage engine 'partition'
ALTER TABLE t1 ADD (new INT); ALTER TABLE t1 ADD (new INT);
ERROR 42000: Unknown table engine 'partition' ERROR 42000: Unknown storage engine 'partition'
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
firstname VARCHAR(25) NOT NULL, firstname VARCHAR(25) NOT NULL,

10
mysql-test/r/partition.result
View File

@ -97,30 +97,30 @@ DROP TABLE t1;
CREATE TABLE t1 (a INT) CREATE TABLE t1 (a INT)
ENGINE=NonExistentEngine; ENGINE=NonExistentEngine;
Warnings: Warnings:
Warning 1286 Unknown table engine 'NonExistentEngine' Warning 1286 Unknown storage engine 'NonExistentEngine'
Warning 1266 Using storage engine MyISAM for table 't1' Warning 1266 Using storage engine MyISAM for table 't1'
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a INT) CREATE TABLE t1 (a INT)
ENGINE=NonExistentEngine ENGINE=NonExistentEngine
PARTITION BY HASH (a); PARTITION BY HASH (a);
Warnings: Warnings:
Warning 1286 Unknown table engine 'NonExistentEngine' Warning 1286 Unknown storage engine 'NonExistentEngine'
Warning 1266 Using storage engine MyISAM for table 't1' Warning 1266 Using storage engine MyISAM for table 't1'
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a INT) CREATE TABLE t1 (a INT)
ENGINE=Memory; ENGINE=Memory;
ALTER TABLE t1 ENGINE=NonExistentEngine; ALTER TABLE t1 ENGINE=NonExistentEngine;
Warnings: Warnings:
Warning 1286 Unknown table engine 'NonExistentEngine' Warning 1286 Unknown storage engine 'NonExistentEngine'
ALTER TABLE t1 ALTER TABLE t1
PARTITION BY HASH (a) PARTITION BY HASH (a)
(PARTITION p0 ENGINE=Memory, (PARTITION p0 ENGINE=Memory,
PARTITION p1 ENGINE=NonExistentEngine); PARTITION p1 ENGINE=NonExistentEngine);
Warnings: Warnings:
Warning 1286 Unknown table engine 'NonExistentEngine' Warning 1286 Unknown storage engine 'NonExistentEngine'
ALTER TABLE t1 ENGINE=NonExistentEngine; ALTER TABLE t1 ENGINE=NonExistentEngine;
Warnings: Warnings:
Warning 1286 Unknown table engine 'NonExistentEngine' Warning 1286 Unknown storage engine 'NonExistentEngine'
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (

4
mysql-test/r/partition_innodb.result
View File

@ -196,7 +196,7 @@ create table t1 (a int)
engine = x engine = x
partition by key (a); partition by key (a);
Warnings: Warnings:
Warning 1286 Unknown table engine 'x' Warning 1286 Unknown storage engine 'x'
Warning 1266 Using storage engine MyISAM for table 't1' Warning 1266 Using storage engine MyISAM for table 't1'
show create table t1; show create table t1;
Table Create Table Table Create Table
@ -211,7 +211,7 @@ partition by list (a)
(partition p0 values in (0)); (partition p0 values in (0));
alter table t1 engine = x; alter table t1 engine = x;
Warnings: Warnings:
Warning 1286 Unknown table engine 'x' Warning 1286 Unknown storage engine 'x'
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (

2
mysql-test/r/plugin.result
View File

@ -1,6 +1,6 @@
CREATE TABLE t1(a int) ENGINE=EXAMPLE; CREATE TABLE t1(a int) ENGINE=EXAMPLE;
Warnings: Warnings:
Warning 1286 Unknown table engine 'EXAMPLE' Warning 1286 Unknown storage engine 'EXAMPLE'
Warning 1266 Using storage engine MyISAM for table 't1' Warning 1266 Using storage engine MyISAM for table 't1'
DROP TABLE t1; DROP TABLE t1;
INSTALL PLUGIN example SONAME 'ha_example.so'; INSTALL PLUGIN example SONAME 'ha_example.so';

8
mysql-test/r/show_check.result
View File

@ -1298,13 +1298,13 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par
drop table `mysqlttest\1`.`a\b`; drop table `mysqlttest\1`.`a\b`;
drop database `mysqlttest\1`; drop database `mysqlttest\1`;
show engine foobar status; show engine foobar status;
ERROR 42000: Unknown table engine 'foobar' ERROR 42000: Unknown storage engine 'foobar'
show engine foobar logs; show engine foobar logs;
ERROR 42000: Unknown table engine 'foobar' ERROR 42000: Unknown storage engine 'foobar'
show engine foobar mutex; show engine foobar mutex;
ERROR 42000: Unknown table engine 'foobar' ERROR 42000: Unknown storage engine 'foobar'
show engine mutex status; show engine mutex status;
ERROR 42000: Unknown table engine 'mutex' ERROR 42000: Unknown storage engine 'mutex'
show engine csv status; show engine csv status;
Type Name Status Type Name Status
show engine csv logs; show engine csv logs;

2
mysql-test/r/variables.result
View File

@ -427,7 +427,7 @@ ERROR HY000: Unknown system variable 'unknown_variable'
set max_join_size="hello"; set max_join_size="hello";
ERROR 42000: Incorrect argument type to variable 'max_join_size' ERROR 42000: Incorrect argument type to variable 'max_join_size'
set default_storage_engine=UNKNOWN_TABLE_TYPE; set default_storage_engine=UNKNOWN_TABLE_TYPE;
ERROR 42000: Unknown table engine 'UNKNOWN_TABLE_TYPE' ERROR 42000: Unknown storage engine 'UNKNOWN_TABLE_TYPE'
set default_storage_engine=MERGE, big_tables=2; set default_storage_engine=MERGE, big_tables=2;
ERROR 42000: Variable 'big_tables' can't be set to the value of '2' ERROR 42000: Variable 'big_tables' can't be set to the value of '2'
show local variables like 'default_storage_engine'; show local variables like 'default_storage_engine';

4
mysql-test/r/warnings_engine_disabled.result
View File

@ -1,10 +1,10 @@
create table t1 (id int) engine=NDB; create table t1 (id int) engine=NDB;
Warnings: Warnings:
Warning 1286 Unknown table engine 'NDB' Warning 1286 Unknown storage engine 'NDB'
Warning 1266 Using storage engine MyISAM for table 't1' Warning 1266 Using storage engine MyISAM for table 't1'
alter table t1 engine=NDB; alter table t1 engine=NDB;
Warnings: Warnings:
Warning 1286 Unknown table engine 'NDB' Warning 1286 Unknown storage engine 'NDB'
drop table t1; drop table t1;
SELECT ENGINE, SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='ndbcluster'; SELECT ENGINE, SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='ndbcluster';
ENGINE SUPPORT ENGINE SUPPORT

2
mysql-test/suite/ndb/r/ndb_dd_basic.result
View File

@ -14,7 +14,7 @@ ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M INITIAL_SIZE = 4M
ENGINE=XYZ; ENGINE=XYZ;
Warnings: Warnings:
Warning 1286 Unknown table engine 'XYZ' Warning 1286 Unknown storage engine 'XYZ'
Warning 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' Warning 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
CREATE TABLESPACE ts1 CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat' ADD DATAFILE 'datafile.dat'

4
mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
View File

@ -61,13 +61,13 @@ ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@global.default_storage_engine = 65530.34; SET @@global.default_storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'default_storage_engine' ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@global.default_storage_engine = FILE; SET @@global.default_storage_engine = FILE;
ERROR 42000: Unknown table engine 'FILE' ERROR 42000: Unknown storage engine 'FILE'
SET @@session.default_storage_engine = 8199; SET @@session.default_storage_engine = 8199;
ERROR 42000: Incorrect argument type to variable 'default_storage_engine' ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@session.default_storage_engine = 65530.34; SET @@session.default_storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'default_storage_engine' ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@session.default_storage_engine = RECORD; SET @@session.default_storage_engine = RECORD;
ERROR 42000: Unknown table engine 'RECORD' ERROR 42000: Unknown storage engine 'RECORD'
'#------------------FN_DYNVARS_005_05-----------------------#' '#------------------FN_DYNVARS_005_05-----------------------#'
SELECT @@global.default_storage_engine = SELECT @@global.default_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES

4
mysql-test/suite/sys_vars/r/storage_engine_basic.result
View File

@ -61,13 +61,13 @@ ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@global.storage_engine = 65530.34; SET @@global.storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'storage_engine' ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@global.storage_engine = FILE; SET @@global.storage_engine = FILE;
ERROR 42000: Unknown table engine 'FILE' ERROR 42000: Unknown storage engine 'FILE'
SET @@session.storage_engine = 8199; SET @@session.storage_engine = 8199;
ERROR 42000: Incorrect argument type to variable 'storage_engine' ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@session.storage_engine = 65530.34; SET @@session.storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'storage_engine' ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@session.storage_engine = RECORD; SET @@session.storage_engine = RECORD;
ERROR 42000: Unknown table engine 'RECORD' ERROR 42000: Unknown storage engine 'RECORD'
'#------------------FN_DYNVARS_005_05-----------------------#' '#------------------FN_DYNVARS_005_05-----------------------#'
SELECT @@global.storage_engine = SELECT @@global.storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES

4
sql/share/errmsg-utf8.txt
View File

@ -1777,7 +1777,7 @@ ER_TOO_BIG_FIELDLENGTH 42000 S1009
dan "For stor feltlængde for kolonne '%-.192s' (maks = %lu). Brug BLOB i stedet" dan "For stor feltlængde for kolonne '%-.192s' (maks = %lu). Brug BLOB i stedet"
nla "Te grote kolomlengte voor '%-.192s' (max = %lu). Maak hiervoor gebruik van het type BLOB" nla "Te grote kolomlengte voor '%-.192s' (max = %lu). Maak hiervoor gebruik van het type BLOB"
eng "Column length too big for column '%-.192s' (max = %lu); use BLOB or TEXT instead" eng "Column length too big for column '%-.192s' (max = %lu); use BLOB or TEXT instead"
jps "column '%-.192s' は,確保する column の大きさが多すぎます. (最大 %lu まで). BLOB をかわりに使用してください.", jps "column '%-.192s' は,確保する column の大きさが多すぎます. (最大 %lu まで). BLOB をかわりに使用してください."
est "Tulba '%-.192s' pikkus on liiga pikk (maksimaalne pikkus: %lu). Kasuta BLOB väljatüüpi" est "Tulba '%-.192s' pikkus on liiga pikk (maksimaalne pikkus: %lu). Kasuta BLOB väljatüüpi"
fre "Champ '%-.192s' trop long (max = %lu). Utilisez un BLOB" fre "Champ '%-.192s' trop long (max = %lu). Utilisez un BLOB"
ger "Feldlänge für Feld '%-.192s' zu groß (maximal %lu). BLOB- oder TEXT-Spaltentyp verwenden!" ger "Feldlänge für Feld '%-.192s' zu groß (maximal %lu). BLOB- oder TEXT-Spaltentyp verwenden!"
@ -5014,7 +5014,7 @@ ER_WARN_HOSTNAME_WONT_WORK
por "MySQL foi inicializado em modo --skip-name-resolve. Você necesita reincializá-lo sem esta opção para este grant funcionar" por "MySQL foi inicializado em modo --skip-name-resolve. Você necesita reincializá-lo sem esta opção para este grant funcionar"
spa "MySQL esta inicializado en modo --skip-name-resolve. Usted necesita reinicializarlo sin esta opción para este derecho funcionar" spa "MySQL esta inicializado en modo --skip-name-resolve. Usted necesita reinicializarlo sin esta opción para este derecho funcionar"
ER_UNKNOWN_STORAGE_ENGINE 42000 ER_UNKNOWN_STORAGE_ENGINE 42000
eng "Unknown table engine '%s'" eng "Unknown storage engine '%s'"
ger "Unbekannte Speicher-Engine '%s'" ger "Unbekannte Speicher-Engine '%s'"
por "Motor de tabela desconhecido '%s'" por "Motor de tabela desconhecido '%s'"
spa "Desconocido motor de tabla '%s'" spa "Desconocido motor de tabla '%s'"