#61 fix change column text and blob tests and their generators

mysql-test/suite/tokudb/r/change_column_blob.result

@@ -27,7 +27,7 @@ CREATE TABLE t (a TINYBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a TEXT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a BLOB NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a TEXT NOT NULL;
@@ -45,13 +45,13 @@ CREATE TABLE t (a TINYBLOB NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a TEXT NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a BLOB NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
@@ -69,13 +69,13 @@ CREATE TABLE t (a TINYBLOB NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
@@ -93,7 +93,7 @@ CREATE TABLE t (a TINYBLOB NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a BLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a TINYTEXT NULL;
@@ -145,7 +145,7 @@ CREATE TABLE t (a BLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a BLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
@@ -163,13 +163,13 @@ CREATE TABLE t (a BLOB NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a BLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a BLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
@@ -187,7 +187,7 @@ CREATE TABLE t (a BLOB NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a MEDIUMBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a TINYTEXT NULL;
@@ -263,7 +263,7 @@ CREATE TABLE t (a MEDIUMBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a MEDIUMBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
@@ -281,7 +281,7 @@ CREATE TABLE t (a MEDIUMBLOB NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a LONGBLOB NULL);
 ALTER TABLE t CHANGE COLUMN a a TINYTEXT NULL;

mysql-test/suite/tokudb/r/change_column_text.result

@@ -27,6 +27,7 @@ CREATE TABLE t (a TINYTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a BLOB NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a TEXT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a BLOB NOT NULL;
@@ -44,11 +45,13 @@ CREATE TABLE t (a TINYTEXT NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a BLOB NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a TEXT NOT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
@@ -66,11 +69,13 @@ CREATE TABLE t (a TINYTEXT NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
@@ -88,6 +93,7 @@ CREATE TABLE t (a TINYTEXT NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a TINYBLOB NULL;
@@ -139,6 +145,7 @@ CREATE TABLE t (a TEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
@@ -156,11 +163,13 @@ CREATE TABLE t (a TEXT NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
@@ -178,6 +187,7 @@ CREATE TABLE t (a TEXT NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a MEDIUMTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a TINYBLOB NULL;
@@ -253,6 +263,7 @@ CREATE TABLE t (a MEDIUMTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a MEDIUMTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
@@ -270,6 +281,7 @@ CREATE TABLE t (a MEDIUMTEXT NOT NULL);
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a LONGTEXT NULL);
 ALTER TABLE t CHANGE COLUMN a a TINYBLOB NULL;

mysql-test/suite/tokudb/t/change_column_blob.py

@@ -18,7 +18,8 @@ def gen_tests(base_types, null_types):
                     print "--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/"
                     print "--error ER_UNSUPPORTED_EXTENSION"
                     print "ALTER TABLE t CHANGE COLUMN a a %sTEXT %s;" % (base_types[to_index], null_types[to_null]);
-                    if from_null != to_null or from_index > to_index:
+                    # if from_null != to_null or from_index > to_index:
+                    if from_null != to_null or from_index != to_index:
                         print "--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/"
                         print "--error ER_UNSUPPORTED_EXTENSION"
                     print "ALTER TABLE t CHANGE COLUMN a a %sBLOB %s;" % (base_types[to_index], null_types[to_null]);

mysql-test/suite/tokudb/t/change_column_blob.test

@@ -37,6 +37,7 @@ CREATE TABLE t (a TINYBLOB NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a TEXT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a BLOB NULL;
 DROP TABLE t;
@@ -60,6 +61,7 @@ CREATE TABLE t (a TINYBLOB NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a TEXT NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a BLOB NOT NULL;
 DROP TABLE t;
@@ -67,6 +69,7 @@ CREATE TABLE t (a TINYBLOB NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
 DROP TABLE t;
@@ -90,6 +93,7 @@ CREATE TABLE t (a TINYBLOB NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
 DROP TABLE t;
@@ -97,6 +101,7 @@ CREATE TABLE t (a TINYBLOB NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
 DROP TABLE t;
@@ -120,6 +125,7 @@ CREATE TABLE t (a TINYBLOB NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
 DROP TABLE t;
@@ -187,6 +193,7 @@ CREATE TABLE t (a BLOB NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
 DROP TABLE t;
@@ -210,6 +217,7 @@ CREATE TABLE t (a BLOB NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
 DROP TABLE t;
@@ -217,6 +225,7 @@ CREATE TABLE t (a BLOB NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
 DROP TABLE t;
@@ -240,6 +249,7 @@ CREATE TABLE t (a BLOB NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
 DROP TABLE t;
@@ -339,6 +349,7 @@ CREATE TABLE t (a MEDIUMBLOB NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
 DROP TABLE t;
@@ -362,6 +373,7 @@ CREATE TABLE t (a MEDIUMBLOB NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
 DROP TABLE t;

mysql-test/suite/tokudb/t/change_column_text.py

@@ -18,7 +18,8 @@ def gen_tests(base_types, null_types):
                     print "--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/"
                     print "--error ER_UNSUPPORTED_EXTENSION"
                     print "ALTER TABLE t CHANGE COLUMN a a %sBLOB %s;" % (base_types[to_index], null_types[to_null]);
-                    if from_null != to_null or from_index > to_index:
+                    # if from_null != to_null or from_index > to_index
+                    if from_null != to_null or from_index != to_index:
                         print "--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/"
                         print "--error ER_UNSUPPORTED_EXTENSION"
                     print "ALTER TABLE t CHANGE COLUMN a a %sTEXT %s;" % (base_types[to_index], null_types[to_null]);

mysql-test/suite/tokudb/t/change_column_text.test

@@ -37,6 +37,8 @@ CREATE TABLE t (a TINYTEXT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a BLOB NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a TEXT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
@@ -59,12 +61,16 @@ CREATE TABLE t (a TINYTEXT NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a BLOB NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a TEXT NOT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
@@ -87,12 +93,16 @@ CREATE TABLE t (a TINYTEXT NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TINYTEXT NULL);
@@ -115,6 +125,8 @@ CREATE TABLE t (a TINYTEXT NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
@@ -181,6 +193,8 @@ CREATE TABLE t (a TEXT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
@@ -203,12 +217,16 @@ CREATE TABLE t (a TEXT NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMBLOB NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a MEDIUMTEXT NOT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
 DROP TABLE t;
 CREATE TABLE t (a TEXT NULL);
@@ -231,6 +249,8 @@ CREATE TABLE t (a TEXT NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
 DROP TABLE t;
 CREATE TABLE t (a MEDIUMTEXT NULL);
@@ -329,6 +349,8 @@ CREATE TABLE t (a MEDIUMTEXT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NULL;
 DROP TABLE t;
 CREATE TABLE t (a MEDIUMTEXT NULL);
@@ -351,6 +373,8 @@ CREATE TABLE t (a MEDIUMTEXT NOT NULL);
 --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGBLOB NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a LONGTEXT NOT NULL;
 DROP TABLE t;
 CREATE TABLE t (a LONGTEXT NULL);