Commit 3959be70 authored by Elena Stepanova's avatar Elena Stepanova

10.0-specific changes to storage_engine tests

parents 273bcb92 ae62e19f
...@@ -5,31 +5,30 @@ ALTER ONLINE TABLE t1 MODIFY b <INT_COLUMN> DEFAULT 5; ...@@ -5,31 +5,30 @@ ALTER ONLINE TABLE t1 MODIFY b <INT_COLUMN> DEFAULT 5;
ALTER ONLINE TABLE t1 CHANGE b new_name <INT_COLUMN>; ALTER ONLINE TABLE t1 CHANGE b new_name <INT_COLUMN>;
ALTER ONLINE TABLE t1 COMMENT 'new comment'; ALTER ONLINE TABLE t1 COMMENT 'new comment';
ALTER ONLINE TABLE t1 RENAME TO t2; ALTER ONLINE TABLE t1 RENAME TO t2;
ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
Warnings:
Note 1051 Unknown table 'test.t2'
CREATE TEMPORARY TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TEMPORARY TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'); INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c');
ALTER ONLINE TABLE t1 MODIFY b <INT_COLUMN> DEFAULT 5; ALTER ONLINE TABLE t1 MODIFY b <INT_COLUMN> DEFAULT 5;
ERROR HY000: Can't execute the given 'ALTER' command as online Warnings:
Warning 1366 Incorrect integer value: 'a' for column 'b' at row 1
Warning 1366 Incorrect integer value: 'b' for column 'b' at row 2
Warning 1366 Incorrect integer value: 'c' for column 'b' at row 3
ALTER ONLINE TABLE t1 CHANGE b new_name <INT_COLUMN>; ALTER ONLINE TABLE t1 CHANGE b new_name <INT_COLUMN>;
ERROR HY000: Can't execute the given 'ALTER' command as online
ALTER ONLINE TABLE t1 COMMENT 'new comment'; ALTER ONLINE TABLE t1 COMMENT 'new comment';
ERROR HY000: Can't execute the given 'ALTER' command as online
ALTER ONLINE TABLE t1 RENAME TO t2; ALTER ONLINE TABLE t1 RENAME TO t2;
ERROR HY000: Can't execute the given 'ALTER' command as online DROP TABLE IF EXISTS t1, t2;
DROP TABLE t1;
CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c'); INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c');
ALTER ONLINE TABLE t1 DROP COLUMN b, ADD b <INT_COLUMN>; ALTER ONLINE TABLE t1 DROP COLUMN b, ADD b <INT_COLUMN>;
ERROR HY000: Can't execute the given 'ALTER' command as online
ALTER ONLINE TABLE t1 MODIFY b BIGINT <CUSTOM_COL_OPTIONS>; ALTER ONLINE TABLE t1 MODIFY b BIGINT <CUSTOM_COL_OPTIONS>;
ERROR HY000: Can't execute the given 'ALTER' command as online ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type INPLACE. Try LOCK=SHARED.
ALTER ONLINE TABLE t1 ENGINE=MEMORY; ALTER ONLINE TABLE t1 ENGINE=MEMORY;
ERROR HY000: Can't execute the given 'ALTER' command as online ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
ALTER ONLINE TABLE t1 ADD INDEX (b); ALTER ONLINE TABLE t1 ADD INDEX (b);
ERROR HY000: Can't execute the given 'ALTER' command as online
ALTER TABLE t1 ADD INDEX (b);
ALTER ONLINE TABLE t1 DROP INDEX b; ALTER ONLINE TABLE t1 DROP INDEX b;
ERROR HY000: Can't execute the given 'ALTER' command as online
DROP TABLE t1; DROP TABLE t1;
...@@ -43,10 +43,15 @@ if ($mysql_errname) ...@@ -43,10 +43,15 @@ if ($mysql_errname)
--source unexpected_result.inc --source unexpected_result.inc
} }
# It is here because it used to be supported as ALTER ONLINE,
# but not anymore after the semantics changed in 10.0
# to be the same as ALTER .. LOCK=NONE
--let $error_codes = ER_ALTER_OPERATION_NOT_SUPPORTED
--let $online = 1 --let $online = 1
--let $rename_to = t2 --let $rename_to = t2
--source alter_table.inc --source alter_table.inc
if ($mysql_errname) if ($mysql_errname!=ER_ALTER_OPERATION_NOT_SUPPORTED)
{ {
--source unexpected_result.inc --source unexpected_result.inc
DROP TABLE t1; DROP TABLE t1;
...@@ -54,7 +59,7 @@ if ($mysql_errname) ...@@ -54,7 +59,7 @@ if ($mysql_errname)
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
# #
# temporary tables always require a copy # temporary table does not require locking
# #
--let $temporary = 1 --let $temporary = 1
...@@ -62,32 +67,27 @@ DROP TABLE IF EXISTS t2; ...@@ -62,32 +67,27 @@ DROP TABLE IF EXISTS t2;
INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'); INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c');
--let $error_codes = ER_CANT_DO_ONLINE
--let $online = 1 --let $online = 1
--let $alter_definition = MODIFY b $int_col DEFAULT 5 --let $alter_definition = MODIFY b $int_col DEFAULT 5
--source alter_table.inc --source alter_table.inc
if ($mysql_errname != ER_CANT_DO_ONLINE) if ($mysql_errname)
{ {
--source unexpected_result.inc --source unexpected_result.inc
} }
--let $error_codes = ER_CANT_DO_ONLINE
--let $online = 1 --let $online = 1
--let $alter_definition = CHANGE b new_name $int_col --let $alter_definition = CHANGE b new_name $int_col
--source alter_table.inc --source alter_table.inc
--let $error_codes = ER_CANT_DO_ONLINE
--let $online = 1 --let $online = 1
--let $alter_definition = COMMENT 'new comment' --let $alter_definition = COMMENT 'new comment'
--source alter_table.inc --source alter_table.inc
--let $error_codes = ER_CANT_DO_ONLINE
--let $online = 1 --let $online = 1
--let $rename_to = t2 --let $rename_to = t2
--source alter_table.inc --source alter_table.inc
DROP TABLE t1; DROP TABLE IF EXISTS t1, t2;
# #
# Test of things that is not possible to do online # Test of things that is not possible to do online
...@@ -98,23 +98,26 @@ DROP TABLE t1; ...@@ -98,23 +98,26 @@ DROP TABLE t1;
INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c'); INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c');
--let $error_codes = ER_CANT_DO_ONLINE # It is here because it used to unsupported as ALTER ONLINE,
# but is supported now after the semantics changed in 10.0
# to be the same as ALTER .. LOCK=NONE
--let $online = 1 --let $online = 1
--let $alter_definition = DROP COLUMN b, ADD b $int_col --let $alter_definition = DROP COLUMN b, ADD b $int_col
--source alter_table.inc --source alter_table.inc
if ($mysql_errname!=ER_CANT_DO_ONLINE) if ($mysql_errname)
{ {
--source unexpected_result.inc --source unexpected_result.inc
} }
--let $error_codes = ER_CANT_DO_ONLINE --let $error_codes = ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
--let $online = 1 --let $online = 1
--let $alter_definition = MODIFY b BIGINT $default_col_opts --let $alter_definition = MODIFY b BIGINT $default_col_opts
--source alter_table.inc --source alter_table.inc
--let $alternative_engine = `SELECT engine FROM information_schema.engines WHERE engine IN ('MEMORY','MyISAM') AND engine != '$storage_engine' ORDER BY engine LIMIT 1` --let $alternative_engine = `SELECT engine FROM information_schema.engines WHERE engine IN ('MEMORY','MyISAM') AND engine != '$storage_engine' ORDER BY engine LIMIT 1`
--let $error_codes = ER_CANT_DO_ONLINE --let $error_codes = ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
--let $online = 1 --let $online = 1
--let $alter_definition = ENGINE=$alternative_engine --let $alter_definition = ENGINE=$alternative_engine
--source alter_table.inc --source alter_table.inc
...@@ -130,26 +133,21 @@ if ($mysql_errname) ...@@ -130,26 +133,21 @@ if ($mysql_errname)
} }
if (!$mysql_errname) if (!$mysql_errname)
{ {
--let $error_codes = ER_CANT_DO_ONLINE
--let $online = 1
--let $alter_definition = ADD INDEX (b)
--source alter_table.inc
if ($mysql_errname!=ER_CANT_DO_ONLINE)
{
--let $functionality = Adding an index or ALTER ONLINE
--source unexpected_result.inc
}
# It is here because it used to unsupported as ALTER ONLINE,
# but is supported now after the semantics changed in 10.0
# to be the same as ALTER .. LOCK=NONE
--let $online = 1
--let $alter_definition = ADD INDEX (b) --let $alter_definition = ADD INDEX (b)
--source alter_table.inc --source alter_table.inc
if ($mysql_errname) if ($mysql_errname)
{ {
--let $functionality = Adding an index or ALTER TABLE --let $functionality = Adding an index or ALTER ONLINE
--source unexpected_result.inc --source unexpected_result.inc
} }
if (!$mysql_errname) if (!$mysql_errname)
{ {
--let $error_codes = ER_CANT_DO_ONLINE
--let $online = 1 --let $online = 1
--let $alter_definition = DROP INDEX b --let $alter_definition = DROP INDEX b
--source alter_table.inc --source alter_table.inc
......
...@@ -10,8 +10,10 @@ a ...@@ -10,8 +10,10 @@ a
2 2
ALTER TABLE t1 DISCARD TABLESPACE; ALTER TABLE t1 DISCARD TABLESPACE;
SELECT a FROM t1; SELECT a FROM t1;
ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine <STORAGE_ENGINE> ERROR HY000: Tablespace has been discarded for table 't1'
ALTER TABLE t1 IMPORT TABLESPACE; ALTER TABLE t1 IMPORT TABLESPACE;
Warnings:
Warning 1810 <STORAGE_ENGINE>: IO Read error: (2, No such file or directory) Error opening './test/t1.cfg', will attempt to import without schema verification
SELECT a FROM t1; SELECT a FROM t1;
a a
1 1
......
...@@ -62,11 +62,11 @@ EOF ...@@ -62,11 +62,11 @@ EOF
--let $alter_definition = DISCARD TABLESPACE --let $alter_definition = DISCARD TABLESPACE
--source alter_table.inc --source alter_table.inc
--let $error_codes = ER_GET_ERRNO --let $error_codes = ER_TABLESPACE_DISCARDED
--replace_result $storage_engine <STORAGE_ENGINE> --replace_result $storage_engine <STORAGE_ENGINE>
SELECT a FROM t1; SELECT a FROM t1;
--source check_errors.inc --source check_errors.inc
if ($mysql_errname != ER_GET_ERRNO) if ($mysql_errname != ER_TABLESPACE_DISCARDED)
{ {
--let $functionality = Tablespace operations --let $functionality = Tablespace operations
--source unexpected_result.inc --source unexpected_result.inc
......
...@@ -177,7 +177,6 @@ HEX(v0) HEX(v1) HEX(v64) LENGTH(HEX(v65000)) ...@@ -177,7 +177,6 @@ HEX(v0) HEX(v1) HEX(v64) LENGTH(HEX(v65000))
ALTER TABLE t1 ADD COLUMN v65536 VARBINARY(65536) <CUSTOM_COL_OPTIONS> NOT NULL; ALTER TABLE t1 ADD COLUMN v65536 VARBINARY(65536) <CUSTOM_COL_OPTIONS> NOT NULL;
Warnings: Warnings:
Note 1246 Converting column 'v65536' from VARBINARY to BLOB Note 1246 Converting column 'v65536' from VARBINARY to BLOB
Note 1246 Converting column 'v65536' from VARBINARY to BLOB
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
v0 varbinary(0) # # # v0 varbinary(0) # # #
...@@ -690,7 +689,6 @@ v0 v1 v64 LENGTH(v65000) ...@@ -690,7 +689,6 @@ v0 v1 v64 LENGTH(v65000)
ALTER TABLE t1 ADD COLUMN v65536 VARCHAR(65536) <CUSTOM_COL_OPTIONS> NOT NULL; ALTER TABLE t1 ADD COLUMN v65536 VARCHAR(65536) <CUSTOM_COL_OPTIONS> NOT NULL;
Warnings: Warnings:
Note 1246 Converting column 'v65536' from VARCHAR to TEXT Note 1246 Converting column 'v65536' from VARCHAR to TEXT
Note 1246 Converting column 'v65536' from VARCHAR to TEXT
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
v0 varchar(0) # # # v0 varchar(0) # # #
...@@ -977,7 +975,6 @@ a b c ...@@ -977,7 +975,6 @@ a b c
ALTER TABLE t1 ADD COLUMN e ENUM('a','A') <CUSTOM_COL_OPTIONS> NOT NULL; ALTER TABLE t1 ADD COLUMN e ENUM('a','A') <CUSTOM_COL_OPTIONS> NOT NULL;
Warnings: Warnings:
Note 1291 Column 'e' has duplicated value 'a' in ENUM Note 1291 Column 'e' has duplicated value 'a' in ENUM
Note 1291 Column 'e' has duplicated value 'a' in ENUM
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a enum('') # # # a enum('') # # #
...@@ -1936,7 +1933,6 @@ a b c ...@@ -1936,7 +1933,6 @@ a b c
ALTER TABLE t1 ADD COLUMN e SET('a','A') <CUSTOM_COL_OPTIONS> NOT NULL; ALTER TABLE t1 ADD COLUMN e SET('a','A') <CUSTOM_COL_OPTIONS> NOT NULL;
Warnings: Warnings:
Note 1291 Column 'e' has duplicated value 'a' in SET Note 1291 Column 'e' has duplicated value 'a' in SET
Note 1291 Column 'e' has duplicated value 'a' in SET
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a set('') # # # a set('') # # #
......
...@@ -173,7 +173,6 @@ HEX(v0) HEX(v1) HEX(v64) LENGTH(HEX(v65000)) ...@@ -173,7 +173,6 @@ HEX(v0) HEX(v1) HEX(v64) LENGTH(HEX(v65000))
ALTER TABLE t1 ADD COLUMN v65536 VARBINARY(65536) <CUSTOM_COL_OPTIONS> NULL; ALTER TABLE t1 ADD COLUMN v65536 VARBINARY(65536) <CUSTOM_COL_OPTIONS> NULL;
Warnings: Warnings:
Note 1246 Converting column 'v65536' from VARBINARY to BLOB Note 1246 Converting column 'v65536' from VARBINARY to BLOB
Note 1246 Converting column 'v65536' from VARBINARY to BLOB
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
v0 varbinary(0) # # # v0 varbinary(0) # # #
...@@ -678,7 +677,6 @@ v0 v1 v64 LENGTH(v65000) ...@@ -678,7 +677,6 @@ v0 v1 v64 LENGTH(v65000)
ALTER TABLE t1 ADD COLUMN v65536 VARCHAR(65536) <CUSTOM_COL_OPTIONS> NULL; ALTER TABLE t1 ADD COLUMN v65536 VARCHAR(65536) <CUSTOM_COL_OPTIONS> NULL;
Warnings: Warnings:
Note 1246 Converting column 'v65536' from VARCHAR to TEXT Note 1246 Converting column 'v65536' from VARCHAR to TEXT
Note 1246 Converting column 'v65536' from VARCHAR to TEXT
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
v0 varchar(0) # # # v0 varchar(0) # # #
...@@ -945,7 +943,6 @@ a b c ...@@ -945,7 +943,6 @@ a b c
ALTER TABLE t1 ADD COLUMN e ENUM('a','A') <CUSTOM_COL_OPTIONS> NULL; ALTER TABLE t1 ADD COLUMN e ENUM('a','A') <CUSTOM_COL_OPTIONS> NULL;
Warnings: Warnings:
Note 1291 Column 'e' has duplicated value 'a' in ENUM Note 1291 Column 'e' has duplicated value 'a' in ENUM
Note 1291 Column 'e' has duplicated value 'a' in ENUM
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a enum('') # # # a enum('') # # #
...@@ -1862,7 +1859,6 @@ a b c ...@@ -1862,7 +1859,6 @@ a b c
ALTER TABLE t1 ADD COLUMN e SET('a','A') <CUSTOM_COL_OPTIONS> NULL; ALTER TABLE t1 ADD COLUMN e SET('a','A') <CUSTOM_COL_OPTIONS> NULL;
Warnings: Warnings:
Note 1291 Column 'e' has duplicated value 'a' in SET Note 1291 Column 'e' has duplicated value 'a' in SET
Note 1291 Column 'e' has duplicated value 'a' in SET
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a set('') # # # a set('') # # #
......
...@@ -58,7 +58,12 @@ index_stats db_name NULL NULL ...@@ -58,7 +58,12 @@ index_stats db_name NULL NULL
index_stats index_name NULL NULL index_stats index_name NULL NULL
index_stats prefix_arity NULL NULL index_stats prefix_arity NULL NULL
index_stats table_name NULL NULL index_stats table_name NULL NULL
ndb_binlog_index epoch NULL NULL innodb_index_stats database_name NULL NULL
innodb_index_stats index_name NULL NULL
innodb_index_stats stat_name NULL NULL
innodb_index_stats table_name NULL NULL
innodb_table_stats database_name NULL NULL
innodb_table_stats table_name NULL NULL
plugin name NULL NULL plugin name NULL NULL
proc db NULL NULL proc db NULL NULL
proc name NULL NULL proc name NULL NULL
......
...@@ -24,14 +24,14 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'); ...@@ -24,14 +24,14 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2; CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2;
CHECKSUM TABLE t1; CHECKSUM TABLE t1;
Table Checksum Table Checksum
test.t1 0 test.t1 4272806499
CHECKSUM TABLE t2, t1; CHECKSUM TABLE t2, t1;
Table Checksum Table Checksum
test.t2 0 test.t2 0
test.t1 0 test.t1 4272806499
CHECKSUM TABLE t1, t2 QUICK; CHECKSUM TABLE t1, t2 QUICK;
Table Checksum Table Checksum
test.t1 0 test.t1 4272806499
test.t2 0 test.t2 0
CHECKSUM TABLE t1, t2 EXTENDED; CHECKSUM TABLE t1, t2 EXTENDED;
Table Checksum Table Checksum
......
...@@ -26,7 +26,6 @@ a b c ...@@ -26,7 +26,6 @@ a b c
ALTER TABLE t1 ADD COLUMN e ENUM('a','A') <CUSTOM_COL_OPTIONS>; ALTER TABLE t1 ADD COLUMN e ENUM('a','A') <CUSTOM_COL_OPTIONS>;
Warnings: Warnings:
Note 1291 Column 'e' has duplicated value 'a' in ENUM Note 1291 Column 'e' has duplicated value 'a' in ENUM
Note 1291 Column 'e' has duplicated value 'a' in ENUM
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a enum('') # # # a enum('') # # #
......
...@@ -32,7 +32,6 @@ a b c ...@@ -32,7 +32,6 @@ a b c
ALTER TABLE t1 ADD COLUMN e SET('a','A') <CUSTOM_COL_OPTIONS>; ALTER TABLE t1 ADD COLUMN e SET('a','A') <CUSTOM_COL_OPTIONS>;
Warnings: Warnings:
Note 1291 Column 'e' has duplicated value 'a' in SET Note 1291 Column 'e' has duplicated value 'a' in SET
Note 1291 Column 'e' has duplicated value 'a' in SET
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a set('') # # # a set('') # # #
......
...@@ -81,7 +81,6 @@ HEX(v0) HEX(v1) HEX(v64) LENGTH(HEX(v65000)) ...@@ -81,7 +81,6 @@ HEX(v0) HEX(v1) HEX(v64) LENGTH(HEX(v65000))
ALTER TABLE t1 ADD COLUMN v65536 VARBINARY(65536) <CUSTOM_COL_OPTIONS>; ALTER TABLE t1 ADD COLUMN v65536 VARBINARY(65536) <CUSTOM_COL_OPTIONS>;
Warnings: Warnings:
Note 1246 Converting column 'v65536' from VARBINARY to BLOB Note 1246 Converting column 'v65536' from VARBINARY to BLOB
Note 1246 Converting column 'v65536' from VARBINARY to BLOB
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
v0 varbinary(0) # # # v0 varbinary(0) # # #
......
...@@ -116,7 +116,6 @@ v0 v1 v64 LENGTH(v65000) ...@@ -116,7 +116,6 @@ v0 v1 v64 LENGTH(v65000)
ALTER TABLE t1 ADD COLUMN v65536 VARCHAR(65536) <CUSTOM_COL_OPTIONS>; ALTER TABLE t1 ADD COLUMN v65536 VARCHAR(65536) <CUSTOM_COL_OPTIONS>;
Warnings: Warnings:
Note 1246 Converting column 'v65536' from VARCHAR to TEXT Note 1246 Converting column 'v65536' from VARCHAR to TEXT
Note 1246 Converting column 'v65536' from VARCHAR to TEXT
SHOW COLUMNS IN t1; SHOW COLUMNS IN t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
v0 varchar(0) # # # v0 varchar(0) # # #
......
alter_table_online : MDEV-397 (Changing a column name via ALTER ONLINE does not work for InnoDB)
autoinc_vars : MySQL:65225 (InnoDB miscalculates auto-increment) autoinc_vars : MySQL:65225 (InnoDB miscalculates auto-increment)
tbl_opt_ai : MySQL:65901 (AUTO_INCREMENT option on InnoDB table is ignored if added before autoinc column) tbl_opt_ai : MySQL:65901 (AUTO_INCREMENT option on InnoDB table is ignored if added before autoinc column)
delete_low_prio : InnoDB does not use table-level locking delete_low_prio : InnoDB does not use table-level locking
......
--- suite/storage_engine/parts/checksum_table.result 2012-07-12 21:41:00.754458011 +0400 --- suite/storage_engine/parts/checksum_table.result 2013-11-08 22:30:34.000000000 +0400
+++ suite/storage_engine/parts/checksum_table.reject 2012-07-15 20:04:35.881962676 +0400 +++ suite/storage_engine/parts/checksum_table.reject 2013-11-08 22:32:30.000000000 +0400
@@ -24,15 +24,15 @@ @@ -31,8 +31,8 @@
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2; test.t1 4272806499
CHECKSUM TABLE t1;
Table Checksum
-test.t1 0
+test.t1 4272806499
CHECKSUM TABLE t2, t1;
Table Checksum
test.t2 0
-test.t1 0
+test.t1 4272806499
CHECKSUM TABLE t1, t2 QUICK; CHECKSUM TABLE t1, t2 QUICK;
Table Checksum Table Checksum
-test.t1 0 -test.t1 4272806499
-test.t2 0 -test.t2 0
+test.t1 NULL +test.t1 NULL
+test.t2 NULL +test.t2 NULL
......
repair_table : InnoDB of 5.6.10 does not support repair on partitioned tables (fixed by 5.6.14)
--ignore-builtin-innodb
--plugin-load=ha_innodb
--innodb --innodb
--- suite/storage_engine/repair_table.result 2012-07-15 01:26:44.347708000 +0400 --- suite/storage_engine/repair_table.result 2013-10-03 20:35:06.000000000 +0400
+++ suite/storage_engine/repair_table.reject 2012-07-15 17:50:37.927013454 +0400 +++ suite/storage_engine/repair_table.reject 2013-11-08 22:04:22.000000000 +0400
@@ -4,56 +4,57 @@ @@ -4,56 +4,57 @@
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
REPAIR TABLE t1; REPAIR TABLE t1;
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
DROP TABLE t1, t2; DROP TABLE t1, t2;
call mtr.add_suppression("Got an error from thread_id=.*"); call mtr.add_suppression("Got an error from thread_id=.*");
call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
@@ -62,45 +63,14 @@ @@ -62,45 +63,32 @@
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
REPAIR TABLE t1; REPAIR TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
...@@ -98,16 +98,19 @@ ...@@ -98,16 +98,19 @@
-t1.MYI -t1.MYI
+test.t1 repair note The storage engine for the table doesn't support repair +test.t1 repair note The storage engine for the table doesn't support repair
t1.frm t1.frm
-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o'); +t1.ibd
-# Statement ended with one of expected results (0,144). INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');
-# If you got a difference in error message, just add it to rdiff file # Statement ended with one of expected results (0,144).
-FLUSH TABLE t1; # If you got a difference in error message, just add it to rdiff file
FLUSH TABLE t1;
-Restoring <DATADIR>/test/t1.MYD -Restoring <DATADIR>/test/t1.MYD
-CHECK TABLE t1; +Restoring <DATADIR>/test/t1.ibd
-Table Op Msg_type Msg_text CHECK TABLE t1;
Table Op Msg_type Msg_text
-test.t1 check error Size of datafile is: 39 Should be: 65 -test.t1 check error Size of datafile is: 39 Should be: 65
-test.t1 check error Corrupt -test.t1 check error Corrupt
-SELECT a,b FROM t1; +test.t1 check status OK
SELECT a,b FROM t1;
-ERROR HY000: Incorrect key file for table 't1'; try to repair it -ERROR HY000: Incorrect key file for table 't1'; try to repair it
-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144).
-# If you got a difference in error message, just add it to rdiff file -# If you got a difference in error message, just add it to rdiff file
...@@ -124,6 +127,12 @@ ...@@ -124,6 +127,12 @@
-test.t1 check error Corrupt -test.t1 check error Corrupt
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed -ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed
-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). +a b
-# If you got a difference in error message, just add it to rdiff file +7 g
+8 h
+10 j
+14 n
+15 o
# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144).
# If you got a difference in error message, just add it to rdiff file
DROP TABLE t1; DROP TABLE t1;
--ignore-builtin-innodb
--plugin-load=ha_innodb
--innodb --innodb
--- suite/storage_engine/tbl_opt_data_index_dir.result 2012-06-24 23:55:19.539380000 +0400 --- suite/storage_engine/tbl_opt_data_index_dir.result 2013-10-03 20:35:06.000000000 +0400
+++ suite/storage_engine/tbl_opt_data_index_dir.reject 2012-07-15 17:51:04.070684784 +0400 +++ suite/storage_engine/tbl_opt_data_index_dir.reject 2013-11-08 22:06:54.000000000 +0400
@@ -4,7 +4,7 @@ @@ -1,10 +1,12 @@
DROP TABLE IF EXISTS t1;
+Warnings:
+Warning 1618 <INDEX DIRECTORY> option ignored
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`b` char(8) DEFAULT NULL `b` char(8) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>' -) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>'
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 +) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>'
Warnings: Warnings:
Warning 1618 <INDEX DIRECTORY> option ignored Warning 1618 <INDEX DIRECTORY> option ignored
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
@@ -12,5 +12,5 @@ @@ -12,5 +14,5 @@
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`b` char(8) DEFAULT NULL `b` char(8) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>' -) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>'
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 +) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>'
DROP TABLE t1; DROP TABLE t1;
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED;
+Warnings: +Warnings:
+Warning 140 <STORAGE_ENGINE>: assuming ROW_FORMAT=COMPACT. +Warning 1478 <STORAGE_ENGINE>: assuming ROW_FORMAT=COMPACT.
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
--ignore-builtin-innodb
--plugin-load=ha_innodb
--innodb --innodb
--innodb-lock-wait-timeout=1 --innodb-lock-wait-timeout=1
--- suite/storage_engine/type_char_indexes.result 2012-07-12 19:27:42.191013570 +0400 --- suite/storage_engine/type_char_indexes.result 2012-07-12 19:27:42.191013570 +0400
+++ suite/storage_engine/type_char_indexes.reject 2012-07-15 17:51:55.810034331 +0400 +++ suite/storage_engine/type_char_indexes.reject 2012-07-15 17:51:55.810034331 +0400
@@ -98,7 +98,7 @@
SET SESSION optimizer_switch = 'engine_condition_pushdown=on';
EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
id select_type table type possible_keys key key_len ref rows Extra
-# # # range c_v c_v # # # Using index condition
+# # # range c_v c_v # # # Using where
SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
c c20 v16 v128
b char3 varchar1a varchar1b
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
r3a r3a
EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16; EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16;
......
--- suite/storage_engine/vcol.result 2012-07-12 20:24:16.628339715 +0400
+++ suite/storage_engine/vcol.reject 2012-07-15 17:53:17.457007891 +0400
@@ -1,69 +1,12 @@
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> GENERATED ALWAYS AS (a+1)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW COLUMNS IN t1;
-Field Type Null Key Default Extra
-a int(11) # #
-b int(11) # # VIRTUAL
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-SELECT a,b FROM t1;
-a b
-1 2
-2 3
-3 4
-4 5
-DROP TABLE t1;
-CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> GENERATED ALWAYS AS (a+1) PERSISTENT) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW COLUMNS IN t1;
-Field Type Null Key Default Extra
-a int(11) # #
-b int(11) # # PERSISTENT
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-SELECT a,b FROM t1;
-a b
-1 2
-2 3
-3 4
-4 5
-DROP TABLE t1;
-CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> GENERATED ALWAYS AS (a+1) VIRTUAL) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW COLUMNS IN t1;
-Field Type Null Key Default Extra
-a int(11) # #
-b int(11) # # VIRTUAL
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-SELECT a,b FROM t1;
-a b
-1 2
-2 3
-3 4
-4 5
-DROP TABLE t1;
-CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> AS (a+1) PERSISTENT) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW COLUMNS IN t1;
-Field Type Null Key Default Extra
-a int(11) # #
-b int(11) # # PERSISTENT
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored
-SELECT a,b FROM t1;
-a b
-1 2
-2 3
-3 4
-4 5
-DROP TABLE t1;
+ERROR HY000: <STORAGE_ENGINE> storage engine does not support computed columns
+# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------
+# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=InnoDB /*!*/ /*Custom table options*/ ]
+# The statement|command finished with ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS.
+# Virtual columns or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
--- suite/storage_engine/alter_table_online.result 2013-11-08 20:01:16.000000000 +0400
+++ suite/storage_engine/alter_table_online.reject 2013-11-08 20:02:03.000000000 +0400
@@ -2,8 +2,35 @@
CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c');
ALTER ONLINE TABLE t1 MODIFY b <INT_COLUMN> DEFAULT 5;
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_ALTER_OPERATION_NOT_SUPPORTED.
+# Functionality or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
ALTER ONLINE TABLE t1 CHANGE b new_name <INT_COLUMN>;
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_ALTER_OPERATION_NOT_SUPPORTED.
+# Functionality or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
ALTER ONLINE TABLE t1 COMMENT 'new comment';
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_ALTER_OPERATION_NOT_SUPPORTED.
+# Functionality or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
ALTER ONLINE TABLE t1 RENAME TO t2;
ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
DROP TABLE IF EXISTS t2;
@@ -23,12 +50,30 @@
CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c');
ALTER ONLINE TABLE t1 DROP COLUMN b, ADD b <INT_COLUMN>;
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_ALTER_OPERATION_NOT_SUPPORTED.
+# Functionality or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
ALTER ONLINE TABLE t1 MODIFY b BIGINT <CUSTOM_COL_OPTIONS>;
-ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type INPLACE. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected results: ER_ALTER_OPERATION_NOT_SUPPORTED_REASON)
ALTER ONLINE TABLE t1 ENGINE=MEMORY;
ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
DROP TABLE t1;
CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
ALTER ONLINE TABLE t1 ADD INDEX (b);
-ALTER ONLINE TABLE t1 DROP INDEX b;
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+# ERROR: Statement ended with errno 1845, errname ER_ALTER_OPERATION_NOT_SUPPORTED (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command finished with ER_ALTER_OPERATION_NOT_SUPPORTED.
+# Adding an index or ALTER ONLINE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
DROP TABLE t1;
--- suite/storage_engine/alter_tablespace.result 2012-07-12 19:53:40.775419511 +0400 --- suite/storage_engine/alter_tablespace.result 2012-07-12 19:53:40.775419511 +0400
+++ suite/storage_engine/alter_tablespace.reject 2012-07-15 16:21:14.910435703 +0400 +++ suite/storage_engine/alter_tablespace.reject 2012-07-15 16:21:14.910435703 +0400
@@ -1,19 +1,14 @@ @@ -1,21 +1,14 @@
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
ALTER TABLE t1 DISCARD TABLESPACE; ALTER TABLE t1 DISCARD TABLESPACE;
...@@ -13,8 +13,10 @@ ...@@ -13,8 +13,10 @@
-2 -2
-ALTER TABLE t1 DISCARD TABLESPACE; -ALTER TABLE t1 DISCARD TABLESPACE;
-SELECT a FROM t1; -SELECT a FROM t1;
-ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine <STORAGE_ENGINE> -ERROR HY000: Tablespace has been discarded for table 't1'
-ALTER TABLE t1 IMPORT TABLESPACE; -ALTER TABLE t1 IMPORT TABLESPACE;
-Warnings:
-Warning 1810 <STORAGE_ENGINE>: IO Read error: (2, No such file or directory) Error opening './test/t1.cfg', will attempt to import without schema verification
-SELECT a FROM t1; -SELECT a FROM t1;
-a -a
-1 -1
......
...@@ -142,4 +142,4 @@ ...@@ -142,4 +142,4 @@
+# ------------------------------------------- +# -------------------------------------------
DROP TABLE t2; DROP TABLE t2;
DROP TABLE t1; DROP TABLE t1;
+ERROR 42S02: Unknown table 't1' +ERROR 42S02: Unknown table 'test.t1'
--- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400
+++ suite/storage_engine/misc.reject 2013-11-08 21:51:58.000000000 +0400
@@ -28,6 +28,9 @@
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;
TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME
+Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
+Warnings:
column_stats column_name NULL NULL
column_stats db_name NULL NULL
column_stats table_name NULL NULL
@@ -58,12 +61,6 @@
index_stats index_name NULL NULL
index_stats prefix_arity NULL NULL
index_stats table_name NULL NULL
-innodb_index_stats database_name NULL NULL
-innodb_index_stats index_name NULL NULL
-innodb_index_stats stat_name NULL NULL
-innodb_index_stats table_name NULL NULL
-innodb_table_stats database_name NULL NULL
-innodb_table_stats table_name NULL NULL
plugin name NULL NULL
proc db NULL NULL
proc name NULL NULL
--- alter_tablespace.result 2013-01-22 22:05:05.246633000 +0400 --- alter_tablespace.result 2013-01-22 22:05:05.246633000 +0400
+++ alter_tablespace.reject 2013-01-23 02:50:11.288110543 +0400 +++ alter_tablespace.reject 2013-01-23 02:50:11.288110543 +0400
@@ -1,19 +1,14 @@ @@ -1,21 +1,14 @@
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
ALTER TABLE t1 DISCARD TABLESPACE; ALTER TABLE t1 DISCARD TABLESPACE;
...@@ -13,18 +13,20 @@ ...@@ -13,18 +13,20 @@
-2 -2
-ALTER TABLE t1 DISCARD TABLESPACE; -ALTER TABLE t1 DISCARD TABLESPACE;
-SELECT a FROM t1; -SELECT a FROM t1;
-ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine <STORAGE_ENGINE> -ERROR HY000: Tablespace has been discarded for table 't1'
-ALTER TABLE t1 IMPORT TABLESPACE; -ALTER TABLE t1 IMPORT TABLESPACE;
-Warnings:
-Warning 1810 <STORAGE_ENGINE>: IO Read error: (2, No such file or directory) Error opening './test/t1.cfg', will attempt to import without schema verification
-SELECT a FROM t1; -SELECT a FROM t1;
-a -a
-1 -1
-2 -2
+ERROR HY000: 'test.t1' is not BASE TABLE +ERROR HY000: Storage engine MRG_MyISAM of the table `test`.`t1` doesn't have this option
+# ERROR: Statement ended with errno 1347, errname ER_WRONG_OBJECT (expected to succeed) +# ERROR: Statement ended with errno 1031, errname ER_ILLEGAL_HA (expected to succeed)
+# ------------ UNEXPECTED RESULT ------------ +# ------------ UNEXPECTED RESULT ------------
+# [ ALTER TABLE t1 DISCARD TABLESPACE ] +# [ ALTER TABLE t1 DISCARD TABLESPACE ]
+# The statement|command finished with ER_WRONG_OBJECT. +# The statement|command finished with ER_ILLEGAL_HA.
+# Tablespace operations or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. +# Tablespace operations or the syntax or the mix could be unsupported.
+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def. +# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped. +# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
+# Also, this problem may cause a chain effect (more errors of different kinds in the test). +# Also, this problem may cause a chain effect (more errors of different kinds in the test).
......
alter_table_online : MySQL:57657 (Temporary MERGE table with temporary underlying is broken by ALTER) alter_table_online : MDEV-5266 (Temporary MERGE table with temporary underlying is broken by ALTER)
...@@ -144,4 +144,4 @@ ...@@ -144,4 +144,4 @@
+# ------------------------------------------- +# -------------------------------------------
DROP TABLE t2; DROP TABLE t2;
DROP TABLE t1; DROP TABLE t1;
+ERROR 42S02: Unknown table 't1' +ERROR 42S02: Unknown table 'test.t1'
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
+ERROR 42S02: Table 'test.t1' doesn't exist +ERROR 42S02: Table 'test.t1' doesn't exist
DROP TABLE t1,t2; DROP TABLE t1,t2;
-ERROR HY000: Table 't2' was not locked with LOCK TABLES -ERROR HY000: Table 't2' was not locked with LOCK TABLES
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
+# ERROR: Statement ended with errno 1051, errname ER_BAD_TABLE_ERROR (expected results: ER_TABLE_NOT_LOCKED) +# ERROR: Statement ended with errno 1051, errname ER_BAD_TABLE_ERROR (expected results: ER_TABLE_NOT_LOCKED)
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1,t2; DROP TABLE t1,t2;
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
CREATE TABLE t3 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t3 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
+# Also, this problem may cause a chain effect (more errors of different kinds in the test). +# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# ------------------------------------------- +# -------------------------------------------
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
+ERROR 42S02: Unknown table 't1,t2,t3' +ERROR 42S02: Unknown table 'test.t1,test.t2,test.t3'
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
LOCK TABLE t1 READ, t2 READ; LOCK TABLE t1 READ, t2 READ;
......
--- suite/storage_engine/misc.result 2013-11-08 21:49:40.000000000 +0400
+++ suite/storage_engine/misc.reject 2013-11-08 21:58:42.000000000 +0400
@@ -28,6 +28,9 @@
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;
TABLE_NAME COLUMN_NAME REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME
+Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
+Warnings:
column_stats column_name NULL NULL
column_stats db_name NULL NULL
column_stats table_name NULL NULL
@@ -58,12 +61,6 @@
index_stats index_name NULL NULL
index_stats prefix_arity NULL NULL
index_stats table_name NULL NULL
-innodb_index_stats database_name NULL NULL
-innodb_index_stats index_name NULL NULL
-innodb_index_stats stat_name NULL NULL
-innodb_index_stats table_name NULL NULL
-innodb_table_stats database_name NULL NULL
-innodb_table_stats table_name NULL NULL
plugin name NULL NULL
proc db NULL NULL
proc name NULL NULL
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
+test.t2 analyze Error Table 'test.t2' doesn't exist +test.t2 analyze Error Table 'test.t2' doesn't exist
+test.t2 analyze status Operation failed +test.t2 analyze status Operation failed
DROP TABLE t1, t2; DROP TABLE t1, t2;
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
CREATE TABLE t1 (a <INT_COLUMN>, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2; CREATE TABLE t1 (a <INT_COLUMN>, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
+ERROR HY000: Engine cannot be used in partitioned tables +ERROR HY000: Engine cannot be used in partitioned tables
+# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
...@@ -84,4 +84,4 @@ ...@@ -84,4 +84,4 @@
+test.t1 analyze Error Table 'test.t1' doesn't exist +test.t1 analyze Error Table 'test.t1' doesn't exist
+test.t1 analyze status Operation failed +test.t1 analyze status Operation failed
DROP TABLE t1; DROP TABLE t1;
+ERROR 42S02: Unknown table 't1' +ERROR 42S02: Unknown table 'test.t1'
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
+test.t1 check Error Table 'test.t1' doesn't exist +test.t1 check Error Table 'test.t1' doesn't exist
+test.t1 check status Operation failed +test.t1 check status Operation failed
DROP TABLE t1, t2; DROP TABLE t1, t2;
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
CREATE TABLE t1 (a <INT_COLUMN>, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2; CREATE TABLE t1 (a <INT_COLUMN>, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
+ERROR HY000: Engine cannot be used in partitioned tables +ERROR HY000: Engine cannot be used in partitioned tables
+# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
...@@ -173,4 +173,4 @@ ...@@ -173,4 +173,4 @@
+test.t1 check Error Table 'test.t1' doesn't exist +test.t1 check Error Table 'test.t1' doesn't exist
+test.t1 check status Operation failed +test.t1 check status Operation failed
DROP TABLE t1; DROP TABLE t1;
+ERROR 42S02: Unknown table 't1' +ERROR 42S02: Unknown table 'test.t1'
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
+Error 1146 Table 'test.t1' doesn't exist +Error 1146 Table 'test.t1' doesn't exist
+Error 1146 Table 'test.t2' doesn't exist +Error 1146 Table 'test.t2' doesn't exist
DROP TABLE t1, t2; DROP TABLE t1, t2;
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
DROP TABLE IF EXISTS t1,t2; DROP TABLE IF EXISTS t1,t2;
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2;
+ERROR HY000: Engine cannot be used in partitioned tables +ERROR HY000: Engine cannot be used in partitioned tables
...@@ -54,14 +54,14 @@ ...@@ -54,14 +54,14 @@
+# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
CHECKSUM TABLE t1; CHECKSUM TABLE t1;
Table Checksum Table Checksum
-test.t1 0 -test.t1 4272806499
+test.t1 NULL +test.t1 NULL
+Warnings: +Warnings:
+Error 1146 Table 'test.t1' doesn't exist +Error 1146 Table 'test.t1' doesn't exist
CHECKSUM TABLE t2, t1; CHECKSUM TABLE t2, t1;
Table Checksum Table Checksum
-test.t2 0 -test.t2 0
-test.t1 0 -test.t1 4272806499
+test.t2 NULL +test.t2 NULL
+test.t1 NULL +test.t1 NULL
+Warnings: +Warnings:
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
+Error 1146 Table 'test.t1' doesn't exist +Error 1146 Table 'test.t1' doesn't exist
CHECKSUM TABLE t1, t2 QUICK; CHECKSUM TABLE t1, t2 QUICK;
Table Checksum Table Checksum
-test.t1 0 -test.t1 4272806499
-test.t2 0 -test.t2 0
+test.t1 NULL +test.t1 NULL
+test.t2 NULL +test.t2 NULL
...@@ -86,4 +86,4 @@ ...@@ -86,4 +86,4 @@
+Error 1146 Table 'test.t1' doesn't exist +Error 1146 Table 'test.t1' doesn't exist
+Error 1146 Table 'test.t2' doesn't exist +Error 1146 Table 'test.t2' doesn't exist
DROP TABLE t1, t2; DROP TABLE t1, t2;
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
+test.t2 optimize Error Table 'test.t2' doesn't exist +test.t2 optimize Error Table 'test.t2' doesn't exist
+test.t2 optimize status Operation failed +test.t2 optimize status Operation failed
DROP TABLE t1, t2; DROP TABLE t1, t2;
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2; CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
+ERROR HY000: Engine cannot be used in partitioned tables +ERROR HY000: Engine cannot be used in partitioned tables
+# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed) +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
...@@ -92,4 +92,4 @@ ...@@ -92,4 +92,4 @@
+test.t1 optimize Error Table 'test.t1' doesn't exist +test.t1 optimize Error Table 'test.t1' doesn't exist
+test.t1 optimize status Operation failed +test.t1 optimize status Operation failed
DROP TABLE t1; DROP TABLE t1;
+ERROR 42S02: Unknown table 't1' +ERROR 42S02: Unknown table 'test.t1'
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
+test.t1 repair Error Table 'test.t1' doesn't exist +test.t1 repair Error Table 'test.t1' doesn't exist
+test.t1 repair status Operation failed +test.t1 repair status Operation failed
DROP TABLE t1, t2; DROP TABLE t1, t2;
+ERROR 42S02: Unknown table 't1,t2' +ERROR 42S02: Unknown table 'test.t1,test.t2'
call mtr.add_suppression("Got an error from thread_id=.*"); call mtr.add_suppression("Got an error from thread_id=.*");
call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
call mtr.add_suppression(" '\..test.t1'"); call mtr.add_suppression(" '\..test.t1'");
...@@ -298,4 +298,4 @@ ...@@ -298,4 +298,4 @@
+test.t1 repair Error Table 'test.t1' doesn't exist +test.t1 repair Error Table 'test.t1' doesn't exist
+test.t1 repair status Operation failed +test.t1 repair status Operation failed
DROP TABLE t1; DROP TABLE t1;
+ERROR 42S02: Unknown table 't1' +ERROR 42S02: Unknown table 'test.t1'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment