4590 Nisha Gopalakrishnan 2012-09-29 [merge]
Bug#13840553: MYSQL MUST IMPROVE ERROR MESSAGES
Follow up patch to map HA_WRONG_CREATE_OPTION handler
error to ER_ILLEGAL_HA SQL error.
modified:
mysql-test/r/partition_innodb_plugin.result
mysql-test/r/partition_innodb_tablespace.result
mysql-test/suite/innodb/r/innodb-create-options.result
mysql-test/suite/innodb/r/innodb-tablespace.result
mysql-test/suite/innodb/r/innodb-zip.result
mysql-test/suite/innodb/r/innodb_16k.result
mysql-test/suite/innodb/r/innodb_4k.result
mysql-test/suite/innodb/r/innodb_8k.result
mysql-test/suite/innodb/t/innodb-create-options.test
mysql-test/suite/innodb/t/innodb-tablespace.test
mysql-test/suite/innodb/t/innodb-zip.test
mysql-test/suite/innodb/t/innodb_16k.test
mysql-test/suite/innodb/t/innodb_4k.test
mysql-test/suite/innodb/t/innodb_8k.test
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
mysql-test/suite/parts/t/partition_basic_symlink_innodb.test
mysql-test/t/partition_innodb_plugin.test
mysql-test/t/partition_innodb_tablespace.test
sql/handler.cc
4589 Annamalai Gurusami 2012-09-28 [merge]
Null merge from mysql-5.6 to mysql-5.7.
=== modified file 'mysql-test/r/partition_innodb_plugin.result'
--- a/mysql-test/r/partition_innodb_plugin.result 2012-06-07 03:42:57 +0000
+++ b/mysql-test/r/partition_innodb_plugin.result 2012-09-29 06:52:11 +0000
@@ -67,7 +67,7 @@ LOCK TABLE t1 WRITE;
# ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
# are incompatible with innodb_file_per_table = OFF;
ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
t1#P#p0.ibd
t1.frm
t1.par
=== modified file 'mysql-test/r/partition_innodb_tablespace.result'
--- a/mysql-test/r/partition_innodb_tablespace.result 2012-06-22 10:10:42 +0000
+++ b/mysql-test/r/partition_innodb_tablespace.result 2012-09-29 06:52:11 +0000
@@ -10,12 +10,12 @@ SET GLOBAL innodb_file_per_table = OFF;
CREATE TABLE t1 (a int KEY, b text) ENGINE = InnoDB PARTITION BY HASH (a)
(PARTITION p0 engine=InnoDB DATA DIRECTORY='MYSQL_TMP_DIR/alternate_dir/data' INDEX DIRECTORY='MYSQL_TMP_DIR/alternate_dir/data',
PARTITION p1 engine=InnoDB DATA DIRECTORY='MYSQL_TMP_DIR/alternate_dir/data' INDEX DIRECTORY='MYSQL_TMP_DIR/alternate_dir/data');
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: DATA DIRECTORY requires innodb_file_per_table.
Warning 1478 InnoDB: INDEX DIRECTORY is not supported
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
Error 6 Error on delete of './test/t1.par' (Errcode: 2 - No such file or directory)
# Try again with innodb_file_per_table = ON and no INDEX DIRECTORY.
SET GLOBAL innodb_file_per_table = ON;
=== modified file 'mysql-test/suite/innodb/r/innodb-create-options.result'
--- a/mysql-test/suite/innodb/r/innodb-create-options.result 2012-06-08 08:20:05 +0000
+++ b/mysql-test/suite/innodb/r/innodb-create-options.result 2012-09-29 06:52:11 +0000
@@ -10,11 +10,11 @@ Note 1051 Unknown table 'test.t1'
# 'FIXED' is sent to InnoDB since it is used by MyISAM.
# But it is an invalid mode in InnoDB
CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: invalid ROW_FORMAT specifier.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
SHOW WARNINGS;
Level Code Message
@@ -58,23 +58,23 @@ t1 Compact
# KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
SHOW WARNINGS;
Level Code Message
@@ -250,11 +250,11 @@ t1 Compact row_format=COMPACT
# Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
# Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
# and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope
# and that they can be set to default values during strict mode.
@@ -263,23 +263,23 @@ DROP TABLE IF EXISTS t1;
Warnings:
Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
SHOW WARNINGS;
Level Code Message
@@ -347,23 +347,23 @@ SET GLOBAL innodb_file_format=Barracuda;
SET GLOBAL innodb_file_per_table=OFF;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=1;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
SHOW WARNINGS;
Level Code Message
=== modified file 'mysql-test/suite/innodb/r/innodb-tablespace.result'
--- a/mysql-test/suite/innodb/r/innodb-tablespace.result 2012-08-28 16:31:49 +0000
+++ b/mysql-test/suite/innodb/r/innodb-tablespace.result 2012-09-29 07:38:38 +0000
@@ -8,11 +8,11 @@ SET default_storage_engine=InnoDB;
#
SET SESSION innodb_strict_mode = ON;
CREATE TABLE t1 (a int KEY, b text) INDEX DIRECTORY='MYSQL_TMP_DIR/alt_dir';
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: INDEX DIRECTORY is not supported
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
#
# Without strict mode, INDEX DIRECTORY is just ignored
#
@@ -37,11 +37,11 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table=OFF;
CREATE TABLE t1 (a int KEY, b text) DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: DATA DIRECTORY requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
#
# Without strict mode, DATA DIRECTORY without innodb_file_per_table=ON is just ignored.
#
@@ -320,11 +320,11 @@ ERROR HY000: Incorrect arguments to DATA
# TEMPORARY tables are incompatible with DATA DIRECTORY
SET SESSION innodb_strict_mode = ON;
CREATE TEMPORARY TABLE t1 (a int KEY, b text) engine=InnoDB DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: DATA DIRECTORY cannot be used for TEMPORARY tables.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
SET SESSION innodb_strict_mode = OFF;
CREATE TEMPORARY TABLE t1 (a int KEY, b text) engine=InnoDB DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
Warnings:
=== modified file 'mysql-test/suite/innodb/r/innodb-zip.result'
--- a/mysql-test/suite/innodb/r/innodb-zip.result 2012-09-01 06:59:01 +0000
+++ b/mysql-test/suite/innodb/r/innodb-zip.result 2012-09-29 06:52:11 +0000
@@ -173,11 +173,11 @@ drop table t1;
set innodb_strict_mode = on;
create table t1 (id int primary key) engine = innodb key_block_size = 0;
create table t2 (id int primary key) engine = innodb key_block_size = 9;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't2' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't2' doesn't have this option
create table t3 (id int primary key) engine = innodb key_block_size = 1;
create table t4 (id int primary key) engine = innodb key_block_size = 2;
create table t5 (id int primary key) engine = innodb key_block_size = 4;
@@ -200,25 +200,25 @@ create table t1 (id int primary key) eng
key_block_size = 4 row_format = compressed;
create table t2 (id int primary key) engine = innodb
key_block_size = 4 row_format = redundant;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't2' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't2' doesn't have this option
create table t3 (id int primary key) engine = innodb
key_block_size = 4 row_format = compact;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't3' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't3' doesn't have this option
create table t4 (id int primary key) engine = innodb
key_block_size = 4 row_format = dynamic;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't4' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't4' doesn't have this option
create table t5 (id int primary key) engine = innodb
key_block_size = 4 row_format = default;
SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql';
@@ -228,61 +228,61 @@ test t5 Compressed 4096 0
drop table t1, t5;
create table t1 (id int primary key) engine = innodb
key_block_size = 9 row_format = redundant;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
Warning 1478 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
create table t2 (id int primary key) engine = innodb
key_block_size = 9 row_format = compact;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't2' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
Warning 1478 InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't2' doesn't have this option
create table t2 (id int primary key) engine = innodb
key_block_size = 9 row_format = dynamic;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't2' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't2' doesn't have this option
SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql';
table_schema table_name row_format data_length index_length
set global innodb_file_per_table = off;
create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't2' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't2' doesn't have this option
create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't3' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't3' doesn't have this option
create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't6' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't6' doesn't have this option
create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't7' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't7' doesn't have this option
create table t8 (id int primary key) engine = innodb row_format = compact;
create table t9 (id int primary key) engine = innodb row_format = redundant;
SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql';
@@ -293,35 +293,35 @@ drop table t8, t9;
set global innodb_file_per_table = on;
set global innodb_file_format = `0`;
create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't2' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't2' doesn't have this option
create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't3' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't3' doesn't have this option
create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't6' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't6' doesn't have this option
create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't7' doesn't have this option
show warnings;
Level Code Message
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't7' doesn't have this option
create table t8 (id int primary key) engine = innodb row_format = compact;
create table t9 (id int primary key) engine = innodb row_format = redundant;
SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql';
=== modified file 'mysql-test/suite/innodb/r/innodb_16k.result'
--- a/mysql-test/suite/innodb/r/innodb_16k.result 2012-09-01 08:34:36 +0000
+++ b/mysql-test/suite/innodb/r/innodb_16k.result 2012-09-29 07:38:38 +0000
@@ -272,17 +272,17 @@ SHOW VARIABLES LIKE 'innodb_file_per_tab
Variable_name Value
innodb_file_per_table OFF
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't4' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't4' doesn't have this option
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't5' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't5' doesn't have this option
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_file_format = `Antelope`;
SHOW VARIABLES LIKE 'innodb_file%';
@@ -292,17 +292,17 @@ innodb_file_format_check ON
innodb_file_format_max Barracuda
innodb_file_per_table ON
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't4' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't4' doesn't have this option
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't5' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't5' doesn't have this option
SET GLOBAL innodb_file_format = `Barracuda`;
# Test 7) This series of tests were moved from innodb-index to here
# because the second alter table t1 assumes a 16k page size.
=== modified file 'mysql-test/suite/innodb/r/innodb_4k.result'
--- a/mysql-test/suite/innodb/r/innodb_4k.result 2012-09-03 09:56:57 +0000
+++ b/mysql-test/suite/innodb/r/innodb_4k.result 2012-09-29 06:52:11 +0000
@@ -127,17 +127,17 @@ ERROR 42000: Specified key was too long;
# in strict mode and converted to 4 in non-strict mode.
SET SESSION innodb_strict_mode = ON;
CREATE TABLE t1 (i int) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 4.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE=8 cannot be larger than 4.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
SHOW WARNINGS;
Level Code Message
@@ -227,19 +227,19 @@ SHOW VARIABLES LIKE 'innodb_file_per_tab
Variable_name Value
innodb_file_per_table OFF
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't4' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
Warning 1478 InnoDB: KEY_BLOCK_SIZE=8 cannot be larger than 4.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't4' doesn't have this option
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't5' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 4.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't5' doesn't have this option
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_file_format = `Antelope`;
SHOW VARIABLES LIKE 'innodb_file%';
@@ -249,19 +249,19 @@ innodb_file_format_check ON
innodb_file_format_max Barracuda
innodb_file_per_table ON
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't4' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
Warning 1478 InnoDB: KEY_BLOCK_SIZE=8 cannot be larger than 4.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't4' doesn't have this option
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't5' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 4.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't5' doesn't have this option
SET GLOBAL innodb_file_format = `Barracuda`;
# Test 7) Not included here; 16k only
# Test 8) Test creating a table that could lead to undo log overflow.
=== modified file 'mysql-test/suite/innodb/r/innodb_8k.result'
--- a/mysql-test/suite/innodb/r/innodb_8k.result 2012-09-03 08:42:22 +0000
+++ b/mysql-test/suite/innodb/r/innodb_8k.result 2012-09-29 06:52:11 +0000
@@ -143,11 +143,11 @@ ERROR 42000: Specified key was too long;
# strict mode and converted to 8 in non-strict mode.
SET SESSION innodb_strict_mode = ON;
CREATE TABLE t1 (i int) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
Level Code Message
@@ -241,18 +241,18 @@ SHOW VARIABLES LIKE 'innodb_file_per_tab
Variable_name Value
innodb_file_per_table OFF
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't4' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't4' doesn't have this option
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't5' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't5' doesn't have this option
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_file_format = `Antelope`;
SHOW VARIABLES LIKE 'innodb_file%';
@@ -262,18 +262,18 @@ innodb_file_format_check ON
innodb_file_format_max Barracuda
innodb_file_per_table ON
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't4' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't4' doesn't have this option
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't5' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8.
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't5' doesn't have this option
SET GLOBAL innodb_file_format = `Barracuda`;
# Test 7) Not included here; 16k only
# Test 8) Test creating a table that could lead to undo log overflow.
=== modified file 'mysql-test/suite/innodb/t/innodb-create-options.test'
--- a/mysql-test/suite/innodb/t/innodb-create-options.test 2012-06-08 08:20:05 +0000
+++ b/mysql-test/suite/innodb/t/innodb-create-options.test 2012-09-29 06:52:11 +0000
@@ -79,7 +79,7 @@ SET SESSION innodb_strict_mode = ON;
DROP TABLE IF EXISTS t1;
--echo # 'FIXED' is sent to InnoDB since it is used by MyISAM.
--echo # But it is an invalid mode in InnoDB
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
SHOW WARNINGS;
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
@@ -107,13 +107,13 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTI
--echo # Test 2) StrictMode=ON, CREATE with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
--echo # KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
DROP TABLE IF EXISTS t1;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
SHOW WARNINGS;
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
@@ -213,7 +213,7 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTI
--echo # Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
DROP TABLE IF EXISTS t1;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
SHOW WARNINGS;
@@ -222,13 +222,13 @@ SHOW WARNINGS;
--echo # and that they can be set to default values during strict mode.
SET GLOBAL innodb_file_format=Antelope;
DROP TABLE IF EXISTS t1;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
SHOW WARNINGS;
CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
@@ -269,13 +269,13 @@ SET GLOBAL innodb_file_format=Barracuda;
--echo # values during strict mode.
SET GLOBAL innodb_file_per_table=OFF;
DROP TABLE IF EXISTS t1;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=1;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
SHOW WARNINGS;
CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
=== modified file 'mysql-test/suite/innodb/t/innodb-tablespace.test'
--- a/mysql-test/suite/innodb/t/innodb-tablespace.test 2012-08-28 16:31:49 +0000
+++ b/mysql-test/suite/innodb/t/innodb-tablespace.test 2012-09-29 07:38:38 +0000
@@ -28,7 +28,7 @@ LET $innodb_strict_mode_orig=`select @@s
--echo #
SET SESSION innodb_strict_mode = ON;
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
eval CREATE TABLE t1 (a int KEY, b text) $index_directory_clause;
SHOW WARNINGS;
@@ -48,7 +48,7 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table=OFF;
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
eval CREATE TABLE t1 (a int KEY, b text) $data_directory_clause;
SHOW WARNINGS;
@@ -239,7 +239,7 @@ eval CREATE TABLE t1 (a int KEY, b text)
--echo # TEMPORARY tables are incompatible with DATA DIRECTORY
SET SESSION innodb_strict_mode = ON;
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
eval CREATE TEMPORARY TABLE t1 (a int KEY, b text) engine=InnoDB $data_directory_clause;
SHOW WARNINGS;
SET SESSION innodb_strict_mode = OFF;
=== modified file 'mysql-test/suite/innodb/t/innodb-zip.test'
--- a/mysql-test/suite/innodb/t/innodb-zip.test 2012-06-07 11:48:56 +0000
+++ b/mysql-test/suite/innodb/t/innodb-zip.test 2012-09-29 06:52:11 +0000
@@ -162,7 +162,7 @@ set innodb_strict_mode = on;
create table t1 (id int primary key) engine = innodb key_block_size = 0;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t2 (id int primary key) engine = innodb key_block_size = 9;
show warnings;
@@ -189,17 +189,17 @@ drop table t1, t3, t4, t5, t8, t9, t10,
create table t1 (id int primary key) engine = innodb
key_block_size = 4 row_format = compressed;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t2 (id int primary key) engine = innodb
key_block_size = 4 row_format = redundant;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t3 (id int primary key) engine = innodb
key_block_size = 4 row_format = compact;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t4 (id int primary key) engine = innodb
key_block_size = 4 row_format = dynamic;
show warnings;
@@ -211,17 +211,17 @@ key_block_size = 4 row_format = default;
drop table t1, t5;
#test multiple errors
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t1 (id int primary key) engine = innodb
key_block_size = 9 row_format = redundant;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t2 (id int primary key) engine = innodb
key_block_size = 9 row_format = compact;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t2 (id int primary key) engine = innodb
key_block_size = 9 row_format = dynamic;
show warnings;
@@ -231,23 +231,23 @@ show warnings;
#test valid values with innodb_file_per_table unset
set global innodb_file_per_table = off;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t1 (id int primary key) engine = innodb key_block_size = 1;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t2 (id int primary key) engine = innodb key_block_size = 2;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t3 (id int primary key) engine = innodb key_block_size = 4;
show warnings;
# Tests for key_block_size = 8 and 16 were moved to innodb_16k, innodb_8k
# and innodb_4k since they get different warnings with smaller page sizes.
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t6 (id int primary key) engine = innodb row_format = compressed;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t7 (id int primary key) engine = innodb row_format = dynamic;
show warnings;
create table t8 (id int primary key) engine = innodb row_format = compact;
@@ -261,23 +261,23 @@ drop table t8, t9;
set global innodb_file_per_table = on;
set global innodb_file_format = `0`;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t1 (id int primary key) engine = innodb key_block_size = 1;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t2 (id int primary key) engine = innodb key_block_size = 2;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t3 (id int primary key) engine = innodb key_block_size = 4;
show warnings;
# Tests for key_block_size = 8 and 16 were moved to innodb_16k, innodb_8k
# and innodb_4k since they get different warnings with smaller page sizes.
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t6 (id int primary key) engine = innodb row_format = compressed;
show warnings;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
create table t7 (id int primary key) engine = innodb row_format = dynamic;
show warnings;
create table t8 (id int primary key) engine = innodb row_format = compact;
=== modified file 'mysql-test/suite/innodb/t/innodb_16k.test'
--- a/mysql-test/suite/innodb/t/innodb_16k.test 2012-06-22 10:10:42 +0000
+++ b/mysql-test/suite/innodb/t/innodb_16k.test 2012-09-29 06:52:11 +0000
@@ -286,19 +286,19 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table = OFF;
SHOW VARIABLES LIKE 'innodb_file_per_table';
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_file_format = `Antelope`;
SHOW VARIABLES LIKE 'innodb_file%';
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_format = `Barracuda`;
=== modified file 'mysql-test/suite/innodb/t/innodb_4k.test'
--- a/mysql-test/suite/innodb/t/innodb_4k.test 2012-09-03 09:56:57 +0000
+++ b/mysql-test/suite/innodb/t/innodb_4k.test 2012-09-29 06:52:11 +0000
@@ -165,11 +165,11 @@ CREATE TABLE t1 (a varchar(64) character
SET SESSION innodb_strict_mode = ON;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 (i int) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
@@ -236,19 +236,19 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table = OFF;
SHOW VARIABLES LIKE 'innodb_file_per_table';
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_file_format = `Antelope`;
SHOW VARIABLES LIKE 'innodb_file%';
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_format = `Barracuda`;
=== modified file 'mysql-test/suite/innodb/t/innodb_8k.test'
--- a/mysql-test/suite/innodb/t/innodb_8k.test 2012-09-03 08:42:22 +0000
+++ b/mysql-test/suite/innodb/t/innodb_8k.test 2012-09-29 06:52:11 +0000
@@ -182,7 +182,7 @@ CREATE TABLE t1 (a varchar(128) characte
SET SESSION innodb_strict_mode = ON;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t1 (i int) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
@@ -254,19 +254,19 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table = OFF;
SHOW VARIABLES LIKE 'innodb_file_per_table';
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_per_table = ON;
SET GLOBAL innodb_file_format = `Antelope`;
SHOW VARIABLES LIKE 'innodb_file%';
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8;
SHOW WARNINGS;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16;
SHOW WARNINGS;
SET GLOBAL innodb_file_format = `Barracuda`;
=== modified file 'mysql-test/suite/parts/r/partition_basic_symlink_innodb.result'
--- a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result 2012-06-15 15:32:44 +0000
+++ b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result 2012-09-29 07:38:38 +0000
@@ -16,12 +16,12 @@ PARTITION p1
DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir'
INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir'
);
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: DATA DIRECTORY requires innodb_file_per_table.
Warning 1478 InnoDB: INDEX DIRECTORY is not supported
-Error 1030 Got error 140 from storage engine
+Error 1031 Table storage engine for 't1' doesn't have this option
Error 6 Error on delete of 'MYSQLD_DATADIR/test/t1.par' (Errcode: 2 - No such file or directory)
#
# InnoDB is different from MyISAM in that it uses a text file
=== modified file 'mysql-test/suite/parts/t/partition_basic_symlink_innodb.test'
--- a/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test 2012-06-15 15:32:44 +0000
+++ b/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test 2012-09-29 07:38:38 +0000
@@ -61,7 +61,7 @@ SET SESSION innodb_strict_mode = ON;
--echo #
SET GLOBAL innodb_file_per_table = OFF;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
eval CREATE TABLE t1 (c1 INT) ENGINE = InnoDB
PARTITION BY HASH (c1) (
PARTITION p0
=== modified file 'mysql-test/t/partition_innodb_plugin.test'
--- a/mysql-test/t/partition_innodb_plugin.test 2011-10-12 13:40:11 +0000
+++ b/mysql-test/t/partition_innodb_plugin.test 2012-09-29 06:52:11 +0000
@@ -66,7 +66,7 @@ LOCK TABLE t1 WRITE;
--echo # ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
--echo # are incompatible with innodb_file_per_table = OFF;
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
--replace_result #p# #P#
=== modified file 'mysql-test/t/partition_innodb_tablespace.test'
--- a/mysql-test/t/partition_innodb_tablespace.test 2012-06-22 10:10:42 +0000
+++ b/mysql-test/t/partition_innodb_tablespace.test 2012-09-29 06:52:11 +0000
@@ -28,7 +28,7 @@ LET $innodb_strict_mode_orig=`select @@s
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table = OFF;
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
eval CREATE TABLE t1 (a int KEY, b text) ENGINE = InnoDB PARTITION BY HASH (a)
(PARTITION p0 engine=InnoDB $data_directory $index_directory,
PARTITION p1 engine=InnoDB $data_directory $index_directory);
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc 2012-09-13 08:12:30 +0000
+++ b/sql/handler.cc 2012-09-29 07:38:38 +0000
@@ -3648,6 +3648,9 @@ void handler::print_error(int error, myf
case HA_ERR_TABLE_IN_FK_CHECK:
textno= ER_TABLE_IN_FK_CHECK;
break;
+ case HA_WRONG_CREATE_OPTION:
+ textno= ER_ILLEGAL_HA;
+ break;
default:
{
/* The error was "unknown" to this function.
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (nisha.gopalakrishnan:4589 to 4590)Bug#13840553 | Nisha Gopalakrishnan | 3 Oct |
