summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-12 12:45:06 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-12 12:45:06 +0300
commit7896503686477cce55d058d071d2858a8abf4b04 (patch)
treea926d002e4bf30ef245fea290c13f47bd25e5098 /storage/myisam
parent1d48c4a025e0ffb9bbe4a03388c08602d87fa5fc (diff)
parent4dc10ec68d354241768ce4779c024b4bb2ca897b (diff)
downloadmariadb-git-7896503686477cce55d058d071d2858a8abf4b04.tar.gz
Merge 10.3 into 10.4bb-10.4-supermergejan
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff b/storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff
index 5ae99e2035c..58c7620f3b9 100644
--- a/storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff
+++ b/storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff
@@ -14,7 +14,7 @@
+# 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. Reason: Cannot change column type. 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;