From f7fed26390a2b7b114cf8d7fcc8625589fb02a12 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Fri, 5 Dec 2014 21:38:16 +0400 Subject: Storage engines tests: ALTER ONLINE works differently for MERGE in 10.0 --- .../storage_engine/alter_table_online.rdiff | 82 ++++++++++++++++------ 1 file changed, 60 insertions(+), 22 deletions(-) (limited to 'storage/myisammrg') diff --git a/storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff b/storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff index c21211560e9..854a00cfd81 100644 --- a/storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff @@ -1,44 +1,82 @@ ---- suite/storage_engine/alter_table_online.result 2014-09-25 12:15:42.000000000 +0400 -+++ suite/storage_engine/alter_table_online.reject 2014-11-17 20:25:16.000000000 +0400 -@@ -9,20 +9,35 @@ - CREATE TEMPORARY TABLE t1 (a , b ) ENGINE= ; - INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'); +--- suite/storage_engine/alter_table_online.result 2014-11-12 05:27:00.000000000 +0400 ++++ suite/storage_engine/alter_table_online.reject 2014-12-05 20:42:25.000000000 +0400 +@@ -2,8 +2,35 @@ + CREATE TABLE t1 (a , b , c ) ENGINE= ; + INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c'); ALTER ONLINE TABLE t1 MODIFY b DEFAULT 5; --ERROR HY000: Can't execute the given 'ALTER' command as online -+# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE) ++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 ; ++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 succeeded unexpectedly. ++# 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; +@@ -12,10 +39,6 @@ + CREATE TEMPORARY TABLE t1 (a , b ) ENGINE= ; + INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'); + ALTER ONLINE TABLE t1 MODIFY b DEFAULT 5; +-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 ; --ERROR HY000: Can't execute the given 'ALTER' command as online -+# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE) ALTER ONLINE TABLE t1 COMMENT 'new comment'; --ERROR HY000: Can't execute the given 'ALTER' command as online -+# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE) ALTER ONLINE TABLE t1 RENAME TO t2; --ERROR HY000: Can't execute the given 'ALTER' command as online -+# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE) - DROP TABLE t1; -+ERROR 42S02: Unknown table 't1' +@@ -23,12 +46,30 @@ CREATE TABLE t1 (a , b , c ) ENGINE= ; 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 ; --ERROR HY000: Can't execute the given 'ALTER' command as online -+# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE) ++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 succeeded unexpectedly. ++# 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 ; --ERROR HY000: Can't execute the given 'ALTER' command as online -+# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE) +-ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot change column type INPLACE. Try LOCK=SHARED. ++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 results: ER_ALTER_OPERATION_NOT_SUPPORTED_REASON) 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; + CREATE TABLE t1 (a , b , c ) ENGINE= ; + ALTER ONLINE TABLE t1 ADD INDEX (b); +-ALTER ONLINE TABLE t1 DROP INDEX b; ++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. ++# 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; -- cgit v1.2.1