2732 Konstantin Osipov 2008-10-17 [merge]
Manual merge.
modified:
include/errmsg.h
libmysql/errmsg.c
libmysql/libmysql.c
libmysqld/libmysqld.c
sql-common/client.c
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/backup_test.cc
sql/backup/kernel.cc
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
tests/mysql_client_test.c
=== modified file 'mysql-test/r/create.result'
--- a/mysql-test/r/create.result 2008-10-02 14:03:57 +0000
+++ b/mysql-test/r/create.result 2008-10-17 14:13:24 +0000
@@ -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
=== modified file 'mysql-test/r/log_tables.result'
--- a/mysql-test/r/log_tables.result 2008-09-29 18:20:59 +0000
+++ b/mysql-test/r/log_tables.result 2008-10-17 14:13:24 +0000
@@ -235,7 +235,7 @@ set @save_storage_engine= @@session.stor
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;
=== modified file 'mysql-test/r/mysql.result'
--- a/mysql-test/r/mysql.result 2008-07-23 11:28:20 +0000
+++ b/mysql-test/r/mysql.result 2008-10-17 14:13:24 +0000
@@ -378,9 +378,9 @@ WARNING: --server-arg option not support
+---+
| 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;
=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result 2008-10-07 15:40:12 +0000
+++ b/mysql-test/r/partition.result 2008-10-17 14:13:24 +0000
@@ -2,30 +2,30 @@ drop table if exists t1, t2;
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` (
=== modified file 'mysql-test/r/partition_innodb.result'
--- a/mysql-test/r/partition_innodb.result 2008-07-07 17:54:50 +0000
+++ b/mysql-test/r/partition_innodb.result 2008-10-17 14:13:24 +0000
@@ -66,7 +66,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
@@ -80,7 +80,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` (
=== modified file 'mysql-test/r/plugin.result'
--- a/mysql-test/r/plugin.result 2008-02-24 13:12:17 +0000
+++ b/mysql-test/r/plugin.result 2008-10-17 14:13:24 +0000
@@ -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';
=== modified file 'mysql-test/r/storage_engine_basic.result'
--- a/mysql-test/r/storage_engine_basic.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/storage_engine_basic.result 2008-10-17 14:13:24 +0000
@@ -60,13 +60,13 @@ ERROR 42000: Incorrect argument type to
SET @@global.storage_engine = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
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: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
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
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result 2008-05-29 12:56:51 +0000
+++ b/mysql-test/r/variables.result 2008-10-17 14:13:24 +0000
@@ -378,7 +378,7 @@ ERROR HY000: Unknown system variable 'un
set max_join_size="hello";
ERROR 42000: Incorrect argument type to variable 'max_join_size'
set storage_engine=UNKNOWN_TABLE_TYPE;
-ERROR 42000: Unknown table engine 'UNKNOWN_TABLE_TYPE'
+ERROR 42000: Unknown storage engine 'UNKNOWN_TABLE_TYPE'
set storage_engine=MERGE, big_tables=2;
ERROR 42000: Variable 'big_tables' can't be set to the value of '2'
show local variables like 'storage_engine';
| Thread |
|---|
| • bzr push into mysql-6.0 branch (kostja:2732) | Konstantin Osipov | 17 Oct |
