refs #5545 baseline mysql alter table tests to mysql 5.5

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

mysql-test/suite/tokudb.alter_table/r/4630.result

@@ -1,7 +1,7 @@
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 DROP TABLE IF EXISTS foo;
 set session tokudb_disable_slow_alter=ON;
-create table foo (a int)engine=TokuDB;
+create table foo (a int);
 insert into foo values (1),(2),(3);
 alter table foo add column b blob;
 select * from foo;
@@ -16,7 +16,7 @@ a	b	c
 2	NULL	
 3	NULL	
 alter table foo add column d blob DEFAULT="asdf";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '="asdf"' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your XYZ server version for the right syntax to use near '="asdf"' at line 1
 select * from foo;
 a	b	c
 1	NULL	

mysql-test/suite/tokudb.alter_table/r/5260.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS hcad;
 set session tokudb_disable_slow_alter=1;
 set session tokudb_row_format=tokudb_zlib;

mysql-test/suite/tokudb.alter_table/r/ai_aui.result

@@ -1,4 +1,4 @@
-set storage_engine='tokudb';
+set default_storage_engine='tokudb';
 drop table if exists t;
 create table t (a int primary key, b int, c int);
 set session tokudb_disable_slow_alter=1;

mysql-test/suite/tokudb.alter_table/r/ai_di.result

@@ -1,5 +1,5 @@
-SET STORAGE_ENGINE='tokudb';
-DROP TABLE IF EXISTS foo;
+set default_storage_engine='tokudb';
+drop table if exists foo;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b int, c int, key(a))engine=TokuDB;
 insert into foo values (1,10,100),(2,20,200),(3,30,300),(3,30,300);

mysql-test/suite/tokudb.alter_table/r/ai_part.result

@@ -0,0 +1,26 @@
+SET STORAGE_ENGINE='TokuDB';
+DROP TABLE IF EXISTS foo;
+SET SESSION tokudb_disable_slow_alter=1;
+CREATE TABLE foo (a INT, b INT, PRIMARY KEY (a)) PARTITION BY HASH(a) PARTITIONS 2;
+INSERT INTO foo VALUES (1,0),(2,0);
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL DEFAULT '0',
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (a)
+PARTITIONS 2 */
+ALTER TABLE foo ADD KEY(b);
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL DEFAULT '0',
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`),
+  KEY `b` (`b`)
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (a)
+PARTITIONS 2 */
+DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/r/alter_column_default.result

@@ -0,0 +1,39 @@
+SET STORAGE_ENGINE='TokuDB';
+DROP TABLE IF EXISTS foo;
+SET SESSION tokudb_disable_slow_alter=1;
+CREATE TABLE foo (a INT NOT NULL DEFAULT 0, b INT DEFAULT NULL);
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL DEFAULT '0',
+  `b` int(11) DEFAULT NULL
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+ALTER TABLE foo ALTER COLUMN a SET DEFAULT 100;
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL DEFAULT '100',
+  `b` int(11) DEFAULT NULL
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+ALTER TABLE foo ALTER COLUMN a DROP DEFAULT;
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+ALTER TABLE foo ALTER COLUMN b SET DEFAULT 42;
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT '42'
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+ALTER TABLE foo ALTER COLUMN b DROP DEFAULT;
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL,
+  `b` int(11)
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/r/auto_inc.result

@@ -1,7 +1,7 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 set session tokudb_disable_slow_alter=ON;
-create table foo(a int auto_increment, b int, primary key (a))engine=TokuDB;
+create table foo(a int auto_increment, b int, primary key (a));
 insert into foo (b) values (11),(21),(32);
 select * from foo;
 a	b
@@ -53,17 +53,17 @@ foo	CREATE TABLE `foo` (
   PRIMARY KEY (`a`)
 ) ENGINE=TokuDB AUTO_INCREMENT=1006 DEFAULT CHARSET=latin1
 alter table foo auto_increment=100000, add column c int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo auto_increment=100000, drop column b;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo auto_increment=100000, add key b(b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo auto_increment=100000, change b b bigint;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo auto_increment=100000, change b c int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo auto_increment=100000, ROW_FORMAT=TOKUDB_LZMA;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo auto_increment=100000, change b b int DEFAULT 111;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/r/di_dui.result

@@ -1,4 +1,4 @@
-set storage_engine='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 drop table if exists t;
 create table t (a int, b int, c int, primary key(a), key(b), unique key(c));
 set session tokudb_disable_slow_alter=1;

mysql-test/suite/tokudb.alter_table/r/hcad_all_add.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aa blob, bb longblob, cc tinyblob, dd mediumblob, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_add2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aa blob, bb longblob, cc tinyblob, dd mediumblob, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_add3.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aa blob, bb longblob, cc tinyblob, dd mediumblob, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_blob_add.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_blob_drop.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_drop.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aa blob, bb longblob, cc tinyblob, dd mediumblob, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_fixed_add.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_fixed_drop.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_var_add.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_all_var_drop.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_and_rename_table.result

@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS s, t;
+CREATE TABLE s (a INT) ENGINE=TokuDB;
+SHOW CREATE TABLE s;
+Table	Create Table
+s	CREATE TABLE `s` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+SET tokudb_disable_slow_alter=1;
+ALTER TABLE s RENAME TO t, ADD COLUMN b INT;
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+DROP TABLE t;

mysql-test/suite/tokudb.alter_table/r/hcad_clustering.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int NOT NULL, b bigint NOT NULL, c mediumint NOT NULL, primary key (a), clustering key (b))engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_clustering2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a varchar(10) NOT NULL, b varchar(10) NOT NULL, c varchar(10) NOT NULL, primary key (a), clustering key (b))engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_diff_num_offset_bytes.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo(a varchar(10), b varchar (10), c varchar(10), d varchar(10))engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_add.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_add2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_fixedblob_drop.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_add.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_add2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_fixedvar_drop.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c date, d tinyint, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_indexing_mix.result

@@ -1,74 +1,74 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
-create table foo (aa int, bb int, cc int, dd int, ee int, a int, b varchar(20), c int, d int, e int, primary key (e), key(d), unique key(c), clustering key (b))engine=TokuDB;
+create table foo (aa int, bb int, cc int, dd int, ee int, a int, b varchar(20), c int, d int, e int, primary key (e), key(d), unique key(c), clustering key (b));
 alter table foo drop column e;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column d;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column c;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column b;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int first;
 alter table foo drop column aaa;
 alter table foo add column aaa int first;
 alter table foo drop column aaa, drop index d;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, add index (bb);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop index b, add index b(b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, drop index b, add index b(d);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, drop index b, add index b(b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, drop index b, add clustering index b(b(5));
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, drop index b, add clustering index b(b);
 alter table foo add column aaa int, drop index d;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, add index (bb);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index b, add index b(b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index b, add index b(d);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index b, add unique index b(b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index b, add index b(b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index b, add clustering index b(b(5));
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index b, add clustering index b(b);
 alter table foo drop column aaa, drop index c;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, add index (bb);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop index c, add index c(c);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, drop index c, add index c(d);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, drop index c, add index c(c);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop column aaa, drop index c, add unique index c(c);
 alter table foo add column aaa int, drop index c;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, add index (bb);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index c, add index c(c);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index c, add index c(d);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index c, add clustering index c(c);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index c, add index c(c);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaa int, drop index c, add unique index c(c);
 alter table foo add column aaaa int, drop column c;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaaa int, add column bbbb int, drop column c;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add column aaaa int, drop column c, drop column b;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 drop table foo;

mysql-test/suite/tokudb.alter_table/r/hcad_null_bits.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int NOT NULL, b bigint NOT NULL, c tinyint NOT NULL, d int NOT NULL, primary key (b))engine=TokuDB;
@@ -42,7 +42,7 @@ drop table foo;
 drop table bar;
 create table foo (a int, b int not null, c int, d int not null, e int, primary key (e))engine=TokuDB;
 alter table foo drop column e;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 create table bar like foo;
 alter table bar engine=MyISAM;
 insert into foo values (NULL, -1, NULL, -1,1),(0,0,0,0,0),(NULL,234,234,324,234),(98567,76,NULL,7668,90909);
@@ -61,7 +61,7 @@ drop table foo;
 drop table bar;
 create table foo (a varchar(20), b varchar(20) not null, c varchar(20), d varchar(20) not null, e int, primary key (e))engine=TokuDB;
 alter table foo drop column e;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 create table bar like foo;
 alter table bar engine=MyISAM;
 insert into foo values (NULL, "-1", NULL, "-1",1),("dfg0","0rrr","eee0","qwert",0),(NULL,"234","234","324",234),("98567","76",NULL,"7668","90909");

mysql-test/suite/tokudb.alter_table/r/hcad_part.result

@@ -0,0 +1,25 @@
+SET STORAGE_ENGINE='TokuDB';
+DROP TABLE IF EXISTS foo;
+SET SESSION tokudb_disable_slow_alter=1;
+CREATE TABLE foo (a INT, b INT, PRIMARY KEY (a)) PARTITION BY HASH(a) PARTITIONS 2;
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL DEFAULT '0',
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (a)
+PARTITIONS 2 */
+ALTER TABLE foo ADD COLUMN c INT;
+SHOW CREATE TABLE foo;
+Table	Create Table
+foo	CREATE TABLE `foo` (
+  `a` int(11) NOT NULL DEFAULT '0',
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=TokuDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (a)
+PARTITIONS 2 */
+DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/r/hcad_pk.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int NOT NULL, b bigint NOT NULL, c mediumint NOT NULL, primary key (a))engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_pk2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a varchar(10) NOT NULL, b varchar(10) NOT NULL, c varchar(10) NOT NULL, primary key (a))engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_template.result

@@ -1,3 +1,3 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 set session tokudb_disable_slow_alter=ON;

mysql-test/suite/tokudb.alter_table/r/hcad_tmp_tables_56.result

@@ -0,0 +1,21 @@
+SET @@DEFAULT_STORAGE_ENGINE='tokudb';
+DROP TABLE IF EXISTS bar;
+set session tokudb_disable_slow_alter=ON;
+create temporary table bar (a int, key(a))engine=TOkuDB;
+alter table bar add column c int default 0;
+create index blah on bar(a);
+drop index a on bar;
+set session tokudb_disable_slow_alter=OFF;
+insert into bar (a) values (1),(2),(3);
+alter table bar add column b int default 1 first;
+select * from bar;
+b	a	c
+1	1	0
+1	2	0
+1	3	0
+create index blah_b on bar (b);
+select sum(b) from bar;
+sum(b)
+3
+drop index blah_b on bar;
+drop table bar;

mysql-test/suite/tokudb.alter_table/r/hcad_varblob_add.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_varblob_add2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_varblob_drop.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob, aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/hcad_with_dels.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 set session tokudb_disable_slow_alter=ON;
 # Establish connection conn1 (user = root)

mysql-test/suite/tokudb.alter_table/r/hcad_with_lock_sps.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 drop procedure if exists p0;
 drop procedure if exists p1;

mysql-test/suite/tokudb.alter_table/r/hcr.result

@@ -4,28 +4,28 @@ set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b varchar(10), c blob)engine=TokuDB;
 insert into foo values(1,"bb","cccc");
 alter table foo change a aa int, change b bb varchar(10);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change b bb varchar(11);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
-alter table foo change a aa bigint;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
+alter table foo change a aa smallint;
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change a aa int NOT NULL;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
-alter table foo change a aa int, alter column b drop default;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
+alter table foo change a aa int, change b bb varchar(10);
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change b bb varchar(10) CHARACTER SET latin1 COLLATE latin1_general_cs;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change c cc mediumblob;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change a aa int, add column d int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change a aa int, drop column c;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change a aa int, add index (b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add index(b);
 alter table foo change a aa int, drop index b;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
@@ -41,5 +41,5 @@ alter table foo change a aa int DEFAULT 1000;
 drop table foo;
 create table foo (a int, b int, c int) engine=TokuDB;
 alter table foo change c cc int, change a b int, change b a int first;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 drop table foo;

mysql-test/suite/tokudb.alter_table/r/hcr2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 set session tokudb_disable_slow_alter=ON;
 create table foo (

mysql-test/suite/tokudb.alter_table/r/hcr3.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b bigint, c char(10), d varchar(10), e text, primary key (a), key(b), clustering key (d))engine=TOkuDB;

mysql-test/suite/tokudb.alter_table/r/hot_row_format_alter.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 set session tokudb_disable_slow_alter=ON;
 CREATE TABLE foo(a int auto_increment, b int, primary key(a))engine=TokuDB;
@@ -88,15 +88,15 @@ a	b
 2	21
 3	32
 ALTER TABLE foo row_format=TOKUDB_LZMA, add column c int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE foo row_format=TOKUDB_LZMA, drop column b;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE foo row_format=TOKUDB_LZMA,  add key b(b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE foo row_format=TOKUDB_LZMA,  change b b bigint;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE foo row_format=TOKUDB_LZMA, change b c int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 ALTER TABLE foo auto_increment=100000, ROW_FORMAT=TOKUDB_LZMA;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/r/other_alter.result

@@ -4,57 +4,54 @@ set session tokudb_disable_slow_alter=ON;
 create table foo (aa int, bb int, cc int, dd int, ee int, a int, b varchar(20), c int, d int, e int, primary key (e), key(d), unique key(c), clustering key (b))engine=TokuDB;
 create table bar (a int) engine=TokuDB;
 alter table foo drop primary key;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop primary key, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop primary key, drop column aa;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table bar add primary key (a);
-ERROR 42000: Table 'bar' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'bar' uses an extension that doesn't exist in this XYZ version
 alter table bar add primary key (a), add column z int;
-ERROR 42000: Table 'bar' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'bar' uses an extension that doesn't exist in this XYZ version
 alter table foo drop primary key, add primary key (b);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop primary key, add primary key (b), add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo drop primary key, add primary key (b), drop column aa;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo add fulltext key(b);
 ERROR HY000: The used table type doesn't support FULLTEXT indexes
 alter table foo add spatial key (aa);
 ERROR HY000: The used table type doesn't support SPATIAL indexes
 alter table foo alter column cc set default 101010;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
 alter table foo alter column cc set default NULL;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
 alter table foo alter column cc drop default;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
 alter table foo alter column cc set default 101010, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo alter column cc set default NULL, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo alter column cc drop default, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo alter column cc set default 101010, drop column aa;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo alter column cc set default NULL, drop column aa;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo alter column cc drop default, drop column aa;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aaa int, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column e epk int, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aaa int, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column e epk int, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 show create table foo;
 Table	Create Table
 foo	CREATE TABLE `foo` (
   `aa` int(11) DEFAULT NULL,
   `bb` int(11) DEFAULT NULL,
-  `cc` int(11) DEFAULT NULL,
+  `cc` int(11),
   `dd` int(11) DEFAULT NULL,
   `ee` int(11) DEFAULT NULL,
   `a` int(11) DEFAULT NULL,
@@ -68,52 +65,48 @@ foo	CREATE TABLE `foo` (
   CLUSTERING KEY `b` (`b`)
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1
 alter table foo change column aa aa int NOT NULL;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
-alter table foo change column aa aa bigint;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa varchar(20);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa int after cc;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa int NOT NULL;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
-alter table foo modify column aa bigint;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa varchar(20);
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa int after cc;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa int NOT NULL, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa bigint, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa varchar(20), add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa int after cc, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa int NOT NULL, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa bigint, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa varchar(20), add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa int after cc, add column z int;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa int NOT NULL, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa bigint, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa varchar(20), drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo change column aa aa int after cc, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa int NOT NULL, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa bigint, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa varchar(20), drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 alter table foo modify column aa int after cc, drop column bb;
-ERROR 42000: Table 'foo' uses an extension that doesn't exist in this MySQL version
+ERROR 42000: Table 'foo' uses an extension that doesn't exist in this XYZ version
 drop table foo;
 drop table bar;

mysql-test/suite/tokudb.alter_table/r/other_alter2.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo,bar, foo_isam, bar_isam;
 set session tokudb_disable_slow_alter=OFF;
 create table foo (aa int, bb int, cc int, dd int, ee int, a int, b varchar(20), c int, d int, e int, primary key (e), key(d), unique key(c), clustering key (b))engine=TokuDB;

mysql-test/suite/tokudb.alter_table/r/row_format_alter.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 CREATE TABLE foo (c1 int not null primary key) engine=TokuDB;
 SELECT CREATE_OPTIONS 

mysql-test/suite/tokudb.alter_table/r/virtual_columns.result

@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 DROP TABLE IF EXISTS foo;
 set session tokudb_disable_slow_alter=ON;
 create table foo (a int, b int, c int, d int as (a mod 10) virtual, key(a))engine=TokuDB;

mysql-test/suite/tokudb.alter_table/t/4630.test

@@ -3,19 +3,20 @@
 # Record inconsistency.
 #
 #
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;
 --enable_warnings
 
 set session tokudb_disable_slow_alter=ON;
-create table foo (a int)engine=TokuDB;
+create table foo (a int);
 insert into foo values (1),(2),(3);
 alter table foo add column b blob;
 select * from foo;
 alter table foo add column c blob NOT NULL;
 select * from foo;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_PARSE_ERROR
 alter table foo add column d blob DEFAULT="asdf";
 select * from foo;

mysql-test/suite/tokudb.alter_table/t/5260.test

@@ -3,7 +3,7 @@
 # Attempt to change row format with and without
 # other ALTER TABLE statements.
 #
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS hcad;

mysql-test/suite/tokudb.alter_table/t/ai_aui.test

@@ -1,6 +1,6 @@
 # ensure that we can add a key and a unique key simultaneously
 --source include/have_tokudb.inc
-set storage_engine='tokudb';
+set default_storage_engine='tokudb';
 --disable_warnings
 drop table if exists t;
 --enable_warnings

mysql-test/suite/tokudb.alter_table/t/ai_di.test

@@ -1,8 +1,8 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+set default_storage_engine='tokudb';
 
 --disable_warnings
-DROP TABLE IF EXISTS foo;
+drop table if exists foo;
 --enable_warnings
 
 set session tokudb_disable_slow_alter=ON;

mysql-test/suite/tokudb.alter_table/t/ai_part.test

@@ -0,0 +1,14 @@
+--source include/have_tokudb.inc
+--source include/have_partition.inc
+SET STORAGE_ENGINE='TokuDB';
+--disable_warnings
+DROP TABLE IF EXISTS foo;
+--enable_warnings
+SET SESSION tokudb_disable_slow_alter=1;
+CREATE TABLE foo (a INT, b INT, PRIMARY KEY (a)) PARTITION BY HASH(a) PARTITIONS 2;
+INSERT INTO foo VALUES (1,0),(2,0);
+SHOW CREATE TABLE foo;
+ALTER TABLE foo ADD KEY(b);
+SHOW CREATE TABLE foo;
+
+DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/t/alter_column_default.test

@@ -0,0 +1,18 @@
+--source include/have_tokudb.inc
+SET STORAGE_ENGINE='TokuDB';
+--disable_warnings
+DROP TABLE IF EXISTS foo;
+--enable_warnings
+SET SESSION tokudb_disable_slow_alter=1;
+CREATE TABLE foo (a INT NOT NULL DEFAULT 0, b INT DEFAULT NULL);
+SHOW CREATE TABLE foo;
+ALTER TABLE foo ALTER COLUMN a SET DEFAULT 100;
+SHOW CREATE TABLE foo;
+ALTER TABLE foo ALTER COLUMN a DROP DEFAULT;
+SHOW CREATE TABLE foo;
+ALTER TABLE foo ALTER COLUMN b SET DEFAULT 42;
+SHOW CREATE TABLE foo;
+ALTER TABLE foo ALTER COLUMN b DROP DEFAULT;
+SHOW CREATE TABLE foo;
+
+DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/t/auto_inc.test

@@ -3,14 +3,14 @@
 # Attempt to change row format with and without
 # other ALTER TABLE statements.
 #
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;
 --enable_warnings
 
 set session tokudb_disable_slow_alter=ON;
-create table foo(a int auto_increment, b int, primary key (a))engine=TokuDB;
+create table foo(a int auto_increment, b int, primary key (a));
 
 insert into foo (b) values (11),(21),(32);
 select * from foo;
@@ -26,18 +26,31 @@ insert into foo (b) values (11),(21),(32);
 select * from foo;
 show create table foo;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo auto_increment=100000, add column c int;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo auto_increment=100000, drop column b;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo auto_increment=100000, add key b(b);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo auto_increment=100000, change b b bigint;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo auto_increment=100000, change b c int;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo auto_increment=100000, ROW_FORMAT=TOKUDB_LZMA;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo auto_increment=100000, change b b int DEFAULT 111;
 

mysql-test/suite/tokudb.alter_table/t/di_dui.test

@@ -1,6 +1,6 @@
 # ensure that we can drop a key and a unique key simultaneously
 --source include/have_tokudb.inc
-set storage_engine='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 --disable_warnings
 drop table if exists t;
 --enable_warnings

mysql-test/suite/tokudb.alter_table/t/hcad_all_add.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_add2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_add3.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_blob_add.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_blob_drop.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_drop.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_fixed_add.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_fixed_drop.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_var_add.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_all_var_drop.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_and_rename_table.test

@@ -0,0 +1,13 @@
+--source include/have_tokudb.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS s, t;
+--enable_warnings
+
+CREATE TABLE s (a INT) ENGINE=TokuDB;
+SHOW CREATE TABLE s;
+SET tokudb_disable_slow_alter=1;
+ALTER TABLE s RENAME TO t, ADD COLUMN b INT;
+SHOW CREATE TABLE t;
+
+DROP TABLE t;

mysql-test/suite/tokudb.alter_table/t/hcad_clustering.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;

mysql-test/suite/tokudb.alter_table/t/hcad_clustering2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;

mysql-test/suite/tokudb.alter_table/t/hcad_diff_num_offset_bytes.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;

mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_add.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_add2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_fixedblob_drop.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_add.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_add2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_fixedvar_drop.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_indexing_mix.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;
@@ -8,16 +8,22 @@ DROP TABLE IF EXISTS foo,bar;
 set session tokudb_disable_slow_alter=ON;
 
 
-create table foo (aa int, bb int, cc int, dd int, ee int, a int, b varchar(20), c int, d int, e int, primary key (e), key(d), unique key(c), clustering key (b))engine=TokuDB;
-
+create table foo (aa int, bb int, cc int, dd int, ee int, a int, b varchar(20), c int, d int, e int, primary key (e), key(d), unique key(c), clustering key (b));
 
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column e;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column d;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column c;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column b;
 
@@ -25,74 +31,122 @@ alter table foo add column aaa int first;
 alter table foo drop column aaa;
 
 alter table foo add column aaa int first;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, drop index d;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, add index (bb);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop index b, add index b(b);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, drop index b, add index b(d);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, drop index b, add index b(b);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, drop index b, add clustering index b(b(5));
 # successfully drop it
 alter table foo drop column aaa, drop index b, add clustering index b(b);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index d;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, add index (bb);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index b, add index b(b);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index b, add index b(d);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index b, add unique index b(b);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index b, add index b(b);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index b, add clustering index b(b(5));
 # successfully add it
 alter table foo add column aaa int, drop index b, add clustering index b(b);
 
 
-
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, drop index c;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, add index (bb);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop index c, add index c(c);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, drop index c, add index c(d);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column aaa, drop index c, add index c(c);
 # successfully drop it
 alter table foo drop column aaa, drop index c, add unique index c(c);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index c;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, add index (bb);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index c, add index c(c);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index c, add index c(d);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index c, add clustering index c(c);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaa int, drop index c, add index c(c);
 # successfully add it
 alter table foo add column aaa int, drop index c, add unique index c(c);
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaaa int, drop column c;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaaa int, add column bbbb int, drop column c;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo add column aaaa int, drop column c, drop column b;
 
-
 drop table foo;

mysql-test/suite/tokudb.alter_table/t/hcad_null_bits.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;
@@ -40,6 +40,7 @@ drop table foo; drop table bar;
 
 ########################### some simple tests ###############
 create table foo (a int, b int not null, c int, d int not null, e int, primary key (e))engine=TokuDB;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column e;
 create table bar like foo;
@@ -62,6 +63,7 @@ source include/diff_tables.inc;
 drop table foo; drop table bar;
 
 create table foo (a varchar(20), b varchar(20) not null, c varchar(20), d varchar(20) not null, e int, primary key (e))engine=TokuDB;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop column e;
 create table bar like foo;

mysql-test/suite/tokudb.alter_table/t/hcad_part.test

@@ -0,0 +1,13 @@
+--source include/have_tokudb.inc
+--source include/have_partition.inc
+SET STORAGE_ENGINE='TokuDB';
+--disable_warnings
+DROP TABLE IF EXISTS foo;
+--enable_warnings
+SET SESSION tokudb_disable_slow_alter=1;
+CREATE TABLE foo (a INT, b INT, PRIMARY KEY (a)) PARTITION BY HASH(a) PARTITIONS 2;
+SHOW CREATE TABLE foo;
+ALTER TABLE foo ADD COLUMN c INT;
+SHOW CREATE TABLE foo;
+
+DROP TABLE foo;

mysql-test/suite/tokudb.alter_table/t/hcad_pk.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;

mysql-test/suite/tokudb.alter_table/t/hcad_pk2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;

mysql-test/suite/tokudb.alter_table/t/hcad_template.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.alter_table/t/hcad_tmp_tables.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS bar;
@@ -7,11 +7,14 @@ DROP TABLE IF EXISTS bar;
 
 set session tokudb_disable_slow_alter=ON;
 
-create temporary table bar (a int, key(a))engine=TOkuDB;
+create temporary table bar (a int, key(a));
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table bar add column c int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 create index blah on bar(a);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 drop index a on bar;
 

mysql-test/suite/tokudb.alter_table/t/hcad_tmp_tables_56.test

@@ -0,0 +1,23 @@
+#--source include/have_tokudb.inc
+SET @@DEFAULT_STORAGE_ENGINE='tokudb';
+
+--disable_warnings
+DROP TABLE IF EXISTS bar;
+--enable_warnings
+
+set session tokudb_disable_slow_alter=ON;
+
+create temporary table bar (a int, key(a))engine=TOkuDB;
+alter table bar add column c int default 0;
+create index blah on bar(a);
+drop index a on bar;
+
+set session tokudb_disable_slow_alter=OFF;
+insert into bar (a) values (1),(2),(3);
+alter table bar add column b int default 1 first;
+select * from bar;
+create index blah_b on bar (b);
+select sum(b) from bar;
+drop index blah_b on bar;
+
+drop table bar;

mysql-test/suite/tokudb.alter_table/t/hcad_varblob_add.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_varblob_add2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_varblob_drop.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb'; 
+SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
 --disable_warnings 
 DROP TABLE IF EXISTS foo,bar; 

mysql-test/suite/tokudb.alter_table/t/hcad_with_dels.test

@@ -1,7 +1,7 @@
 # test simple MVCC, that a transaction does not read something committed after it
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 set session tokudb_disable_slow_alter=ON;
 

mysql-test/suite/tokudb.alter_table/t/hcad_with_lock_sps.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.alter_table/t/hcad_with_locks.test

@@ -1,7 +1,7 @@
 # test simple MVCC, that a transaction does not read something committed after it
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 set session tokudb_disable_slow_alter=ON;
 

mysql-test/suite/tokudb.alter_table/t/hcr.test

@@ -10,39 +10,50 @@ set session tokudb_disable_slow_alter=ON;
 # test that modifying a column with more than just a rename is not fast
 create table foo (a int, b varchar(10), c blob)engine=TokuDB;
 insert into foo values(1,"bb","cccc");
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change a aa int, change b bb varchar(10);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change b bb varchar(11);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
-alter table foo change a aa bigint;
+alter table foo change a aa smallint;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change a aa int NOT NULL;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
-alter table foo change a aa int, alter column b drop default;
+alter table foo change a aa int, change b bb varchar(10);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change b bb varchar(10) CHARACTER SET latin1 COLLATE latin1_general_cs;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change c cc mediumblob;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change a aa int, add column d int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change a aa int, drop column c;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change a aa int, add index (b);
 alter table foo add index(b);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change a aa int, drop index b;
 show create table foo;
 select * from foo;
 
-#--error ER_UNSUPPORTED_EXTENSION
 alter table foo change a aa int DEFAULT 1000;
 
 drop table foo;
 
 create table foo (a int, b int, c int) engine=TokuDB;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change c cc int, change a b int, change b a int first;
 

mysql-test/suite/tokudb.alter_table/t/hcr2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.alter_table/t/hcr3.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.alter_table/t/hot_row_format_alter.test

@@ -2,7 +2,7 @@
 #
 # Verify that row format changes are non-blocking, hot operations.
 #
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;
@@ -41,16 +41,27 @@ select * from foo;
 # Trying to change row format along with another 
 # option should NOT be hot/non-blocking.  
 #
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE foo row_format=TOKUDB_LZMA, add column c int;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE foo row_format=TOKUDB_LZMA, drop column b;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE foo row_format=TOKUDB_LZMA,  add key b(b);
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE foo row_format=TOKUDB_LZMA,  change b b bigint;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE foo row_format=TOKUDB_LZMA, change b c int;
+
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE foo auto_increment=100000, ROW_FORMAT=TOKUDB_LZMA;
 

mysql-test/suite/tokudb.alter_table/t/other_alter.test

@@ -11,110 +11,150 @@ set session tokudb_disable_slow_alter=ON;
 create table foo (aa int, bb int, cc int, dd int, ee int, a int, b varchar(20), c int, d int, e int, primary key (e), key(d), unique key(c), clustering key (b))engine=TokuDB;
 create table bar (a int) engine=TokuDB;
 
-
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop primary key;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop primary key, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop primary key, drop column aa;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table bar add primary key (a);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table bar add primary key (a), add column z int;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop primary key, add primary key (b);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop primary key, add primary key (b), add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo drop primary key, add primary key (b), drop column aa;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_TABLE_CANT_HANDLE_FT
 alter table foo add fulltext key(b);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_TABLE_CANT_HANDLE_SPKEYS
 alter table foo add spatial key (aa);
 
-# Supporting these should be trivial
---error ER_UNSUPPORTED_EXTENSION
+# change default
 alter table foo alter column cc set default 101010;
---error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc set default NULL;
---error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc drop default;
+
+# Supporting these should be trivial
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc set default 101010, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc set default NULL, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc drop default, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc set default 101010, drop column aa;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc set default NULL, drop column aa;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo alter column cc drop default, drop column aa;
 
 # these one day MAY be supported
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aaa int, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column e epk int, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aaa int, drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column e epk int, drop column bb;
 show create table foo;
 
 # the following changes of a column should be slow
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa int NOT NULL;
---error ER_UNSUPPORTED_EXTENSION
-alter table foo change column aa aa bigint;
+#--error ER_UNSUPPORTED_EXTENSION
+#alter table foo change column aa aa bigint;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa varchar(20);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa int after cc;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa int NOT NULL;
---error ER_UNSUPPORTED_EXTENSION
-alter table foo modify column aa bigint;
+#--error ER_UNSUPPORTED_EXTENSION
+#alter table foo modify column aa bigint;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa varchar(20);
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa int after cc;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa int NOT NULL, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa bigint, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa varchar(20), add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa int after cc, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa int NOT NULL, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa bigint, add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa varchar(20), add column z int;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa int after cc, add column z int;
 
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa int NOT NULL, drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa bigint, drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa varchar(20), drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo change column aa aa int after cc, drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa int NOT NULL, drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa bigint, drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa varchar(20), drop column bb;
+--replace_regex /MariaDB/XYZ/ /MySQL/XYZ/
 --error ER_UNSUPPORTED_EXTENSION
 alter table foo modify column aa int after cc, drop column bb;
 

mysql-test/suite/tokudb.alter_table/t/other_alter2.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar, foo_isam, bar_isam;

mysql-test/suite/tokudb.alter_table/t/row_format_alter.test

@@ -3,7 +3,7 @@
 # Attempt to change row format with and without
 # other ALTER TABLE statements.
 #
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.alter_table/t/test_field_same_detection.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,bar;

mysql-test/suite/tokudb.alter_table/t/virtual_columns.test

@@ -1,5 +1,5 @@
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE='tokudb';
+SET DEFAULT_STORAGE_ENGINE='tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;