refs #5333 port varchar expansion tests to mysql 5.5

git-svn-id: file:///svn/mysql/tests/mysql-test@47535 c7de825b-a66e-492c-adef-691d508d4ae1

mysql-test/suite/tokudb.change_column/r/change_varbin_default.result

@@ -22,7 +22,7 @@ t	CREATE TABLE `t` (
   `b` varbinary(256) NOT NULL DEFAULT ''
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255) NOT NULL DEFAULT 'c';
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024) NOT NULL DEFAULT 'd';
 SHOW CREATE TABLE t;
 Table	Create Table
@@ -31,5 +31,5 @@ t	CREATE TABLE `t` (
   `b` varbinary(1024) NOT NULL DEFAULT 'd'
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256) NOT NULL DEFAULT 'e';
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varbin_key.result

@@ -3,20 +3,20 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARBINARY(100), b VARBINARY(256), KEY(a), KEY(b)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(100);
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256);
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a VARBINARY(1), b VARBINARY(2), KEY(a,b)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(3);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(3);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varbin_null.result

@@ -2,29 +2,29 @@ DROP TABLE IF EXISTS t;
 SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARBINARY(100), b VARBINARY(256)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(255) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(256) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a VARBINARY(100) NOT NULL, b VARBINARY(256) NOT NULL) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varbin_rename.result

@@ -2,13 +2,13 @@ DROP TABLE IF EXISTS t;
 SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARBINARY(100), b VARBINARY(256)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a aa VARBINARY(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a aa VARBINARY(255);
 ALTER TABLE t CHANGE COLUMN aa a VARBINARY(255);
 ALTER TABLE t CHANGE COLUMN b bb VARBINARY(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b bb VARBINARY(1024);
 ALTER TABLE t CHANGE COLUMN bb b VARBINARY(1024);
 ALTER TABLE t CHANGE COLUMN b bb VARBINARY(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varbin_varchar.result

@@ -2,9 +2,9 @@ DROP TABLE IF EXISTS t;
 SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARBINARY(1)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(100);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1000);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varchar_charset.result

@@ -2,9 +2,9 @@ DROP TABLE IF EXISTS t;
 SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARCHAR(255)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1) CHARACTER SET latin1 COLLATE latin1_general_cs;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_general_cs;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256) CHARACTER SET latin1 COLLATE latin1_general_cs;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varchar_default.result

@@ -22,7 +22,7 @@ t	CREATE TABLE `t` (
   `b` varchar(256) NOT NULL DEFAULT ''
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255) NOT NULL DEFAULT 'c';
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024) NOT NULL DEFAULT 'd';
 SHOW CREATE TABLE t;
 Table	Create Table
@@ -31,5 +31,5 @@ t	CREATE TABLE `t` (
   `b` varchar(1024) NOT NULL DEFAULT 'd'
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256) NOT NULL DEFAULT 'e';
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varchar_key.result

@@ -3,20 +3,20 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARCHAR(100), b VARCHAR(256), KEY(a), KEY(b)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(100);
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256);
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a VARCHAR(1), b VARCHAR(2), KEY(a,b)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(3);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(3);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varchar_null.result

@@ -2,29 +2,29 @@ DROP TABLE IF EXISTS t;
 SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARCHAR(100), b VARCHAR(256)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256) NOT NULL;
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;
 CREATE TABLE t (a VARCHAR(100) NOT NULL, b VARCHAR(256) NOT NULL) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varchar_rename.result

@@ -2,13 +2,13 @@ DROP TABLE IF EXISTS t;
 SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARCHAR(100), b VARCHAR(256)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a aa VARCHAR(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a aa VARCHAR(255);
 ALTER TABLE t CHANGE COLUMN aa a VARCHAR(255);
 ALTER TABLE t CHANGE COLUMN b bb VARCHAR(255);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN b bb VARCHAR(1024);
 ALTER TABLE t CHANGE COLUMN bb b VARCHAR(1024);
 ALTER TABLE t CHANGE COLUMN b bb VARCHAR(256);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/r/change_varchar_varbin.result

@@ -2,9 +2,9 @@ DROP TABLE IF EXISTS t;
 SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARCHAR(1)) ENGINE=TokuDB;
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(100);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1000);
-ERROR 42000: Table 't' uses an extension that doesn't exist in this MariaDB version
+ERROR 42000: Table 't' uses an extension that doesn't exist in this XYZ version
 DROP TABLE t;

mysql-test/suite/tokudb.change_column/t/change_varbin.test

@@ -29,7 +29,8 @@ while ($i <= 1024)
 let $i=1023;
 while ($i > 0)
 {
-    --error ER_UNSUPPORTED_EXTENSION
+    --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
+--error ER_UNSUPPORTED_EXTENSION
     EVAL ALTER TABLE t CHANGE COLUMN a a VARBINARY($i);
     dec $i;
 }

mysql-test/suite/tokudb.change_column/t/change_varbin_default.test

@@ -16,6 +16,7 @@ ALTER TABLE t CHANGE COLUMN a a VARBINARY(256) NOT NULL DEFAULT 'b';
 SHOW CREATE TABLE t;
 
 # no shrinkage
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255) NOT NULL DEFAULT 'c';
 
@@ -23,6 +24,7 @@ ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024) NOT NULL DEFAULT 'd';
 SHOW CREATE TABLE t;
 
 # no shrinkage
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256) NOT NULL DEFAULT 'e';
 

mysql-test/suite/tokudb.change_column/t/change_varbin_key.test

@@ -10,20 +10,25 @@ CREATE TABLE t (a VARBINARY(100), b VARBINARY(256), KEY(a), KEY(b)) ENGINE=TokuD
 
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(100);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(256);
 
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024);
 
@@ -31,9 +36,11 @@ DROP TABLE t;
 
 CREATE TABLE t (a VARBINARY(1), b VARBINARY(2), KEY(a,b)) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(3);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(3);
 

mysql-test/suite/tokudb.change_column/t/change_varbin_null.test

@@ -9,21 +9,27 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 # nullable -> not null not supporte
 CREATE TABLE t (a VARBINARY(100), b VARBINARY(256)) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(255) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(256) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256) NOT NULL;
 
@@ -32,21 +38,27 @@ DROP TABLE t;
 # not null -> nullable not supported
 CREATE TABLE t (a VARBINARY(100) NOT NULL, b VARBINARY(256) NOT NULL) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(256);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(1024);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARBINARY(256);
 

mysql-test/suite/tokudb.change_column/t/change_varbin_rename.test

@@ -9,6 +9,7 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARBINARY(100), b VARBINARY(256)) ENGINE=TokuDB;
 
 # varbinary shrink with column rename is not supported
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a aa VARBINARY(1);
 
@@ -19,6 +20,7 @@ ALTER TABLE t CHANGE COLUMN a aa VARBINARY(255);
 ALTER TABLE t CHANGE COLUMN aa a VARBINARY(255);
 
 # varbinary shrink woth column rename is not supported
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b bb VARBINARY(255);
 
@@ -29,6 +31,7 @@ ALTER TABLE t CHANGE COLUMN b bb VARBINARY(1024);
 ALTER TABLE t CHANGE COLUMN bb b VARBINARY(1024);
 
 # varbinary shrink with column rename is not supported
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b bb VARBINARY(256);
 

mysql-test/suite/tokudb.change_column/t/change_varbin_varchar.test

@@ -8,12 +8,15 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 
 CREATE TABLE t (a VARBINARY(1)) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(100);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1000);
 

mysql-test/suite/tokudb.change_column/t/change_varchar.test

@@ -29,6 +29,7 @@ while ($i <= 1024)
 let $i=1023;
 while ($i > 0)
 {
+    --replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
     --error ER_UNSUPPORTED_EXTENSION
     EVAL ALTER TABLE t CHANGE COLUMN a a VARCHAR($i);
     dec $i;

mysql-test/suite/tokudb.change_column/t/change_varchar_charset.test

@@ -8,12 +8,15 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 
 CREATE TABLE t (a VARCHAR(255)) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1) CHARACTER SET latin1 COLLATE latin1_general_cs;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_general_cs;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256) CHARACTER SET latin1 COLLATE latin1_general_cs;
 

mysql-test/suite/tokudb.change_column/t/change_varchar_default.test

@@ -16,6 +16,7 @@ ALTER TABLE t CHANGE COLUMN a a VARCHAR(256) NOT NULL DEFAULT 'b';
 SHOW CREATE TABLE t;
 
 # no shrinkage
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255) NOT NULL DEFAULT 'c';
 
@@ -23,6 +24,7 @@ ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024) NOT NULL DEFAULT 'd';
 SHOW CREATE TABLE t;
 
 # no shrinkage
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256) NOT NULL DEFAULT 'e';
 

mysql-test/suite/tokudb.change_column/t/change_varchar_key.test

@@ -10,20 +10,25 @@ CREATE TABLE t (a VARCHAR(100), b VARCHAR(256), KEY(a), KEY(b)) ENGINE=TokuDB;
 
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(100);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256);
 
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024);
 
@@ -31,9 +36,11 @@ DROP TABLE t;
 
 CREATE TABLE t (a VARCHAR(1), b VARCHAR(2), KEY(a,b)) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(3);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(3);
 

mysql-test/suite/tokudb.change_column/t/change_varchar_null.test

@@ -9,21 +9,27 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 # nullable -> not null not supporte
 CREATE TABLE t (a VARCHAR(100), b VARCHAR(256)) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024) NOT NULL;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256) NOT NULL;
 
@@ -32,21 +38,27 @@ DROP TABLE t;
 # not null -> nullable not supported
 CREATE TABLE t (a VARCHAR(100) NOT NULL, b VARCHAR(256) NOT NULL) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(1);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARCHAR(256);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(255);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(1024);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b b VARCHAR(256);
 

mysql-test/suite/tokudb.change_column/t/change_varchar_rename.test

@@ -9,6 +9,7 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 CREATE TABLE t (a VARCHAR(100), b VARCHAR(256)) ENGINE=TokuDB;
 
 # varchar shrink with column rename is not supported
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a aa VARCHAR(1);
 
@@ -19,6 +20,7 @@ ALTER TABLE t CHANGE COLUMN a aa VARCHAR(255);
 ALTER TABLE t CHANGE COLUMN aa a VARCHAR(255);
 
 # varchar shrink woth column rename is not supported
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b bb VARCHAR(255);
 
@@ -29,6 +31,7 @@ ALTER TABLE t CHANGE COLUMN b bb VARCHAR(1024);
 ALTER TABLE t CHANGE COLUMN bb b VARCHAR(1024);
 
 # varchar shrink with column rename is not supported
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN b bb VARCHAR(256);
 

mysql-test/suite/tokudb.change_column/t/change_varchar_varbin.test

@@ -8,12 +8,15 @@ SET SESSION TOKUDB_DISABLE_SLOW_ALTER=ON;
 
 CREATE TABLE t (a VARCHAR(1)) ENGINE=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(100);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE t CHANGE COLUMN a a VARBINARY(1000);