summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/r/create.result4
-rw-r--r--mysql-test/r/log_tables.result2
-rw-r--r--mysql-test/r/mysql.result4
-rw-r--r--mysql-test/r/not_partition.result26
-rw-r--r--mysql-test/r/partition.result10
-rw-r--r--mysql-test/r/partition_innodb.result4
-rw-r--r--mysql-test/r/plugin.result2
-rw-r--r--mysql-test/r/show_check.result8
-rw-r--r--mysql-test/r/variables.result2
-rw-r--r--mysql-test/r/warnings_engine_disabled.result4
-rw-r--r--mysql-test/suite/ndb/r/ndb_dd_basic.result2
-rw-r--r--mysql-test/suite/sys_vars/r/default_storage_engine_basic.result4
-rw-r--r--mysql-test/suite/sys_vars/r/storage_engine_basic.result4
-rw-r--r--sql/share/errmsg-utf8.txt12
14 files changed, 44 insertions, 44 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 471cc6e9a3d..019aeba27b6 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -228,7 +228,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MEMORY DEFAULT CHARSET=latin1
drop table t1;
SET SESSION storage_engine="gemini";
-ERROR 42000: Unknown table engine 'gemini'
+ERROR 42000: Unknown storage engine 'gemini'
SELECT @@storage_engine;
@@storage_engine
MEMORY
@@ -389,7 +389,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MEMORY DEFAULT CHARSET=latin1
drop table t1;
SET SESSION storage_engine="gemini";
-ERROR 42000: Unknown table engine 'gemini'
+ERROR 42000: Unknown storage engine 'gemini'
SELECT @@storage_engine;
@@storage_engine
MEMORY
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 80684e5f5d2..1666d5e0297 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -249,7 +249,7 @@ set @save_storage_engine= @@session.storage_engine;
set storage_engine= MEMORY;
alter table mysql.slow_log engine=NonExistentEngine;
Warnings:
-Warning 1286 Unknown table engine 'NonExistentEngine'
+Warning 1286 Unknown storage engine 'NonExistentEngine'
alter table mysql.slow_log engine=memory;
ERROR HY000: This storage engine cannot be used for log tables"
set storage_engine= @save_storage_engine;
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 366052af95e..b2d4531d0ad 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -397,9 +397,9 @@ WARNING: --server-arg option not supported in this configuration.
+---+
| 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 1286): Unknown table engine 'nonexistent2'
+Warning (Code 1286): Unknown storage engine 'nonexistent2'
Warning (Code 1266): Using storage engine MyISAM for table 't2'
Error (Code 1050): Table 't2' already exists
drop tables t1, t2;
diff --git a/mysql-test/r/not_partition.result b/mysql-test/r/not_partition.result
index f516f8634ce..f3a0e4ea0e5 100644
--- a/mysql-test/r/not_partition.result
+++ b/mysql-test/r/not_partition.result
@@ -1,47 +1,47 @@
DROP TABLE IF EXISTS t1;
FLUSH TABLES;
SELECT * FROM t1;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
TRUNCATE TABLE t1;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
ANALYZE TABLE t1;
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
CHECK TABLE t1;
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
OPTIMIZE TABLE t1;
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
REPAIR TABLE t1;
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
ALTER TABLE t1 REPAIR PARTITION ALL;
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
ALTER TABLE t1 CHECK PARTITION ALL;
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
ALTER TABLE t1 OPTIMIZE PARTITION ALL;
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
ALTER TABLE t1 ANALYZE PARTITION ALL;
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
ALTER TABLE t1 REBUILD PARTITION ALL;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
ALTER TABLE t1 ENGINE Memory;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
ALTER TABLE t1 ADD (new INT);
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
DROP TABLE t1;
CREATE TABLE t1 (
firstname VARCHAR(25) NOT NULL,
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 0435db628f4..b72cc607fe2 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -97,30 +97,30 @@ DROP TABLE t1;
CREATE TABLE t1 (a INT)
ENGINE=NonExistentEngine;
Warnings:
-Warning 1286 Unknown table engine 'NonExistentEngine'
+Warning 1286 Unknown storage engine 'NonExistentEngine'
Warning 1266 Using storage engine MyISAM for table 't1'
DROP TABLE t1;
CREATE TABLE t1 (a INT)
ENGINE=NonExistentEngine
PARTITION BY HASH (a);
Warnings:
-Warning 1286 Unknown table engine 'NonExistentEngine'
+Warning 1286 Unknown storage engine 'NonExistentEngine'
Warning 1266 Using storage engine MyISAM for table 't1'
DROP TABLE t1;
CREATE TABLE t1 (a INT)
ENGINE=Memory;
ALTER TABLE t1 ENGINE=NonExistentEngine;
Warnings:
-Warning 1286 Unknown table engine 'NonExistentEngine'
+Warning 1286 Unknown storage engine 'NonExistentEngine'
ALTER TABLE t1
PARTITION BY HASH (a)
(PARTITION p0 ENGINE=Memory,
PARTITION p1 ENGINE=NonExistentEngine);
Warnings:
-Warning 1286 Unknown table engine 'NonExistentEngine'
+Warning 1286 Unknown storage engine 'NonExistentEngine'
ALTER TABLE t1 ENGINE=NonExistentEngine;
Warnings:
-Warning 1286 Unknown table engine 'NonExistentEngine'
+Warning 1286 Unknown storage engine 'NonExistentEngine'
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result
index 702a1bf8797..d7145fcc604 100644
--- a/mysql-test/r/partition_innodb.result
+++ b/mysql-test/r/partition_innodb.result
@@ -196,7 +196,7 @@ create table t1 (a int)
engine = x
partition by key (a);
Warnings:
-Warning 1286 Unknown table engine 'x'
+Warning 1286 Unknown storage engine 'x'
Warning 1266 Using storage engine MyISAM for table 't1'
show create table t1;
Table Create Table
@@ -211,7 +211,7 @@ partition by list (a)
(partition p0 values in (0));
alter table t1 engine = x;
Warnings:
-Warning 1286 Unknown table engine 'x'
+Warning 1286 Unknown storage engine 'x'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result
index 9cae2b487b2..0d5bc29fc8c 100644
--- a/mysql-test/r/plugin.result
+++ b/mysql-test/r/plugin.result
@@ -1,6 +1,6 @@
CREATE TABLE t1(a int) ENGINE=EXAMPLE;
Warnings:
-Warning 1286 Unknown table engine 'EXAMPLE'
+Warning 1286 Unknown storage engine 'EXAMPLE'
Warning 1266 Using storage engine MyISAM for table 't1'
DROP TABLE t1;
INSTALL PLUGIN example SONAME 'ha_example.so';
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index c6276f319a1..fc995d42fae 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -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 database `mysqlttest\1`;
show engine foobar status;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
show engine foobar logs;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
show engine foobar mutex;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
show engine mutex status;
-ERROR 42000: Unknown table engine 'mutex'
+ERROR 42000: Unknown storage engine 'mutex'
show engine csv status;
Type Name Status
show engine csv logs;
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index e99f4e3deb9..8f8570d43a2 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -427,7 +427,7 @@ ERROR HY000: Unknown system variable 'unknown_variable'
set max_join_size="hello";
ERROR 42000: Incorrect argument type to variable 'max_join_size'
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;
ERROR 42000: Variable 'big_tables' can't be set to the value of '2'
show local variables like 'default_storage_engine';
diff --git a/mysql-test/r/warnings_engine_disabled.result b/mysql-test/r/warnings_engine_disabled.result
index e5d35fdaa5f..3b9d92d87f7 100644
--- a/mysql-test/r/warnings_engine_disabled.result
+++ b/mysql-test/r/warnings_engine_disabled.result
@@ -1,10 +1,10 @@
create table t1 (id int) engine=NDB;
Warnings:
-Warning 1286 Unknown table engine 'NDB'
+Warning 1286 Unknown storage engine 'NDB'
Warning 1266 Using storage engine MyISAM for table 't1'
alter table t1 engine=NDB;
Warnings:
-Warning 1286 Unknown table engine 'NDB'
+Warning 1286 Unknown storage engine 'NDB'
drop table t1;
SELECT ENGINE, SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='ndbcluster';
ENGINE SUPPORT
diff --git a/mysql-test/suite/ndb/r/ndb_dd_basic.result b/mysql-test/suite/ndb/r/ndb_dd_basic.result
index b956d3b0047..e56c18c5d95 100644
--- a/mysql-test/suite/ndb/r/ndb_dd_basic.result
+++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result
@@ -14,7 +14,7 @@ ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M
ENGINE=XYZ;
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'
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
diff --git a/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result b/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
index 2bbb6fe6012..541c0b6b328 100644
--- a/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/default_storage_engine_basic.result
@@ -61,13 +61,13 @@ ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@global.default_storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@global.default_storage_engine = FILE;
-ERROR 42000: Unknown table engine 'FILE'
+ERROR 42000: Unknown storage engine 'FILE'
SET @@session.default_storage_engine = 8199;
ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@session.default_storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
SET @@session.default_storage_engine = RECORD;
-ERROR 42000: Unknown table engine 'RECORD'
+ERROR 42000: Unknown storage engine 'RECORD'
'#------------------FN_DYNVARS_005_05-----------------------#'
SELECT @@global.default_storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
diff --git a/mysql-test/suite/sys_vars/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
index 6af550c1f70..5e80f1343b7 100644
--- a/mysql-test/suite/sys_vars/r/storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
@@ -61,13 +61,13 @@ ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@global.storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@global.storage_engine = FILE;
-ERROR 42000: Unknown table engine 'FILE'
+ERROR 42000: Unknown storage engine 'FILE'
SET @@session.storage_engine = 8199;
ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@session.storage_engine = 65530.34;
ERROR 42000: Incorrect argument type to variable 'storage_engine'
SET @@session.storage_engine = RECORD;
-ERROR 42000: Unknown table engine 'RECORD'
+ERROR 42000: Unknown storage engine 'RECORD'
'#------------------FN_DYNVARS_005_05-----------------------#'
SELECT @@global.storage_engine =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 09812583745..69fd6e0fbe2 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -1777,7 +1777,7 @@ ER_TOO_BIG_FIELDLENGTH 42000 S1009
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"
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"
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!"
@@ -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"
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
- eng "Unknown table engine '%s'"
+ eng "Unknown storage engine '%s'"
ger "Unbekannte Speicher-Engine '%s'"
por "Motor de tabela desconhecido '%s'"
spa "Desconocido motor de tabla '%s'"
@@ -6120,7 +6120,7 @@ ER_LOAD_DATA_INVALID_COLUMN
eng "Invalid column reference (%-.64s) in LOAD DATA"
ER_LOG_PURGE_NO_FILE
- eng "Being purged log %s was not found"
+ eng "Being purged log %s was not found"
ER_XA_RBTIMEOUT XA106
eng "XA_RBTIMEOUT: Transaction branch was rolled back: took too long"
@@ -6196,7 +6196,7 @@ ER_RENAMED_NAME
eng "Renamed"
swe "Namnändrad"
ER_TOO_MANY_CONCURRENT_TRXS
- eng "Too many active concurrent transactions"
+ eng "Too many active concurrent transactions"
WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
eng "Non-ASCII separator arguments are not fully supported"
@@ -6235,7 +6235,7 @@ WARN_COND_ITEM_TRUNCATED
ER_COND_ITEM_TOO_LONG
eng "Data too long for condition item '%s'"
-ER_UNKNOWN_LOCALE
+ER_UNKNOWN_LOCALE
eng "Unknown locale: '%-.64s'"
ER_SLAVE_IGNORE_SERVER_IDS
@@ -6261,7 +6261,7 @@ ER_FIELD_TYPE_NOT_ALLOWED_AS_PARTITION_FIELD
ER_PARTITION_FIELDS_TOO_LONG
eng "The total length of the partitioning fields is too large"
ER_PATH_LENGTH
- eng "The path specified for %.64s is too long."
+ eng "The path specified for %.64s is too long."
ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT
eng "The syntax '%s' is deprecated and will be removed in MySQL %s."
ger "Die Syntax '%s' ist veraltet und wird in MySQL %s entfernt."
View Lorry Controller Status