speed up tokudb tests by adding begin/commit around insert loops

Marked very long running tests as big_test

storage/tokudb/mysql-test/tokudb/r/hotindex-del-0.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 set tokudb_create_index_online=1;
 create index i_a on s(a);
 delete from s where a=10000;

storage/tokudb/mysql-test/tokudb/r/hotindex-del-1.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 set tokudb_create_index_online=1;
 create clustering index i_a on s(a);
 delete from s where a=10000;

storage/tokudb/mysql-test/tokudb/r/hotindex-del-fast.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 create index i_a on s(a);
 delete from s where a=10000;
 show create table s;

storage/tokudb/mysql-test/tokudb/r/hotindex-del-slow.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 set tokudb_create_index_online=1;
 create index i_a on s(a);
 delete from s where a=10000;

storage/tokudb/mysql-test/tokudb/r/hotindex-insert-0.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 set tokudb_create_index_online=1;
 create index i_a on s(a);
 insert into s values (1000000000,10000);

storage/tokudb/mysql-test/tokudb/r/hotindex-insert-1.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 set tokudb_create_index_online=1;
 create index i_a on s(a) clustering=yes;
 insert into s values (1000000000,10000);

storage/tokudb/mysql-test/tokudb/r/hotindex-update-0.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 set tokudb_create_index_online=1;
 create index i_a on s(a);
 update s set a=20000+10000 where a=10000;

storage/tokudb/mysql-test/tokudb/r/hotindex-update-1.result

@@ -2,6 +2,7 @@ SET DEFAULT_STORAGE_ENGINE='tokudb';
 # Establish connection conn1 (user = root)
 drop table if exists s;
 create table s (a int, b int);
+begin;
 insert into s values (10000,0),(10000,1),(10000,2),(10000,3),(10000,4),(10000,5),(10000,6),(10000,7),(10000,8),(10000,9);
 insert into s values (9999,0),(9999,1),(9999,2),(9999,3),(9999,4),(9999,5),(9999,6),(9999,7),(9999,8),(9999,9);
 insert into s values (9998,0),(9998,1),(9998,2),(9998,3),(9998,4),(9998,5),(9998,6),(9998,7),(9998,8),(9998,9);
@@ -10002,6 +10003,7 @@ insert into s values (4,0),(4,1),(4,2),(4,3),(4,4),(4,5),(4,6),(4,7),(4,8),(4,9)
 insert into s values (3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9);
 insert into s values (2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),(2,7),(2,8),(2,9);
 insert into s values (1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8),(1,9);
+commit;
 set tokudb_create_index_online=1;
 create index i_a on s(a) clustering=yes;
 update s set a=20000+10000 where a=10000;

storage/tokudb/mysql-test/tokudb/t/hotindex-del-0.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 set tokudb_create_index_online=1;
 send create index i_a on s(a);

storage/tokudb/mysql-test/tokudb/t/hotindex-del-1.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 set tokudb_create_index_online=1;
 send create index i_a on s(a) clustering=yes;

storage/tokudb/mysql-test/tokudb/t/hotindex-del-fast.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 # set tokudb_create_index_online=1;
 send create index i_a on s(a);

storage/tokudb/mysql-test/tokudb/t/hotindex-del-slow.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 set tokudb_create_index_online=1;
 send create index i_a on s(a);

storage/tokudb/mysql-test/tokudb/t/hotindex-insert-0.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 set tokudb_create_index_online=1;
 send create index i_a on s(a);

storage/tokudb/mysql-test/tokudb/t/hotindex-insert-1.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 set tokudb_create_index_online=1;
 send create index i_a on s(a) clustering=yes;

storage/tokudb/mysql-test/tokudb/t/hotindex-insert-2.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on with replace into optimization
 # test is checking #3406
 
@@ -16,11 +18,13 @@ create table s (a int auto_increment, b int, c int, primary key (a));
 
 --echo # populate table s
 --disable_query_log
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s (b,c) values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 --enable_query_log
 
 --echo # done inserting elements

storage/tokudb/mysql-test/tokudb/t/hotindex-insert-bigchar.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -16,11 +18,13 @@ create table s (a int, b varchar(2000));
 
 --disable_query_log
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,repeat('a', 2000)),($a,repeat('b', 2000)),($a,repeat('c', 2000)),($a,repeat('d', 2000)),($a,repeat('e', 2000)),($a,repeat('f', 2000)),($a,repeat('g', 2000)),($a,repeat('h', 2000)),($a,repeat('i', 2000)),($a,repeat('j', 2000));
     dec $a;
 }
+commit;
 --enable_query_log
 
 set tokudb_create_index_online=1;

storage/tokudb/mysql-test/tokudb/t/hotindex-update-0.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 set tokudb_create_index_online=1;
 send create index i_a on s(a);

storage/tokudb/mysql-test/tokudb/t/hotindex-update-1.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 # test that deletes work when hot indexing is on
 
 SET DEFAULT_STORAGE_ENGINE='tokudb';
@@ -14,11 +16,13 @@ drop table if exists s;
 create table s (a int, b int);
 
 # populate table s
+begin;
 let $a = 10000;
 while ($a) {
     eval insert into s values ($a,0),($a,1),($a,2),($a,3),($a,4),($a,5),($a,6),($a,7),($a,8),($a,9);
     dec $a;
 }
+commit;
 
 set tokudb_create_index_online=1;
 send create index i_a on s(a) clustering=yes;

storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_blob_drop.result

@@ -4,11 +4,13 @@ set session tokudb_disable_slow_alter=ON;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aa;
 alter table bar drop column aa;
@@ -18,11 +20,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bb;
 alter table bar drop column bb;
@@ -32,11 +36,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column cc;
 alter table bar drop column cc;
@@ -46,11 +52,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column dd;
 alter table bar drop column dd;
@@ -60,11 +68,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aa, drop column bb;
 alter table bar drop column aa, drop column bb;
@@ -74,11 +84,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aa, drop column cc;
 alter table bar drop column aa, drop column cc;
@@ -88,11 +100,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aa, drop column dd;
 alter table bar drop column aa, drop column dd;
@@ -102,11 +116,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bb, drop column aa;
 alter table bar drop column bb, drop column aa;
@@ -116,11 +132,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bb, drop column cc;
 alter table bar drop column bb, drop column cc;
@@ -130,11 +148,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bb, drop column dd;
 alter table bar drop column bb, drop column dd;
@@ -144,11 +164,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column cc, drop column aa;
 alter table bar drop column cc, drop column aa;
@@ -158,11 +180,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column cc, drop column bb;
 alter table bar drop column cc, drop column bb;
@@ -172,11 +196,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column cc, drop column dd;
 alter table bar drop column cc, drop column dd;
@@ -186,11 +212,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column dd, drop column aa;
 alter table bar drop column dd, drop column aa;
@@ -200,11 +228,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column dd, drop column bb;
 alter table bar drop column dd, drop column bb;
@@ -214,11 +244,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column dd, drop column cc;
 alter table bar drop column dd, drop column cc;
@@ -228,11 +260,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aa, drop column bb, drop column cc;
 alter table bar drop column aa, drop column bb, drop column cc;
@@ -242,11 +276,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aa, drop column bb, drop column dd;
 alter table bar drop column aa, drop column bb, drop column dd;
@@ -256,11 +292,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aa, drop column cc, drop column dd;
 alter table bar drop column aa, drop column cc, drop column dd;
@@ -270,11 +308,13 @@ drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bb, drop column cc, drop column dd;
 alter table bar drop column bb, drop column cc, drop column dd;

storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_all_var_drop.result

@@ -4,11 +4,13 @@ set session tokudb_disable_slow_alter=ON;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa;
 alter table bar drop column aaa;
@@ -18,11 +20,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb;
 alter table bar drop column bbb;
@@ -32,11 +36,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc;
 alter table bar drop column ccc;
@@ -46,11 +52,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd;
 alter table bar drop column ddd;
@@ -60,11 +68,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column bbb;
 alter table bar drop column aaa, drop column bbb;
@@ -74,11 +84,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column ccc;
 alter table bar drop column aaa, drop column ccc;
@@ -88,11 +100,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column ddd;
 alter table bar drop column aaa, drop column ddd;
@@ -102,11 +116,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column aaa;
 alter table bar drop column bbb, drop column aaa;
@@ -116,11 +132,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column ccc;
 alter table bar drop column bbb, drop column ccc;
@@ -130,11 +148,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column ddd;
 alter table bar drop column bbb, drop column ddd;
@@ -144,11 +164,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column aaa;
 alter table bar drop column ccc, drop column aaa;
@@ -158,11 +180,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column bbb;
 alter table bar drop column ccc, drop column bbb;
@@ -172,11 +196,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column ddd;
 alter table bar drop column ccc, drop column ddd;
@@ -186,11 +212,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column aaa;
 alter table bar drop column ddd, drop column aaa;
@@ -200,11 +228,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column bbb;
 alter table bar drop column ddd, drop column bbb;
@@ -214,11 +244,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column ccc;
 alter table bar drop column ddd, drop column ccc;
@@ -228,11 +260,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column bbb, drop column ccc;
 alter table bar drop column aaa, drop column bbb, drop column ccc;
@@ -242,11 +276,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column bbb, drop column ddd;
 alter table bar drop column aaa, drop column bbb, drop column ddd;
@@ -256,11 +292,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column ccc, drop column ddd;
 alter table bar drop column aaa, drop column ccc, drop column ddd;
@@ -270,11 +308,13 @@ drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column ccc, drop column ddd;
 alter table bar drop column bbb, drop column ccc, drop column ddd;

storage/tokudb/mysql-test/tokudb_alter_table/r/hcad_fixedvar_drop.result

@@ -4,6 +4,7 @@ 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -21,6 +22,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a;
 alter table bar drop column a;
@@ -30,6 +32,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -47,6 +50,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b;
 alter table bar drop column b;
@@ -56,6 +60,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -73,6 +78,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c;
 alter table bar drop column c;
@@ -82,6 +88,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -99,6 +106,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d;
 alter table bar drop column d;
@@ -108,6 +116,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -125,6 +134,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa;
 alter table bar drop column aaa;
@@ -134,6 +144,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -151,6 +162,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb;
 alter table bar drop column bbb;
@@ -160,6 +172,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -177,6 +190,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc;
 alter table bar drop column ccc;
@@ -186,6 +200,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -203,6 +218,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd;
 alter table bar drop column ddd;
@@ -212,6 +228,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -229,6 +246,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column b;
 alter table bar drop column a, drop column b;
@@ -238,6 +256,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -255,6 +274,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column c;
 alter table bar drop column a, drop column c;
@@ -264,6 +284,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -281,6 +302,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column d;
 alter table bar drop column a, drop column d;
@@ -290,6 +312,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -307,6 +330,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column aaa;
 alter table bar drop column a, drop column aaa;
@@ -316,6 +340,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -333,6 +358,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column bbb;
 alter table bar drop column a, drop column bbb;
@@ -342,6 +368,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -359,6 +386,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column ccc;
 alter table bar drop column a, drop column ccc;
@@ -368,6 +396,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -385,6 +414,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column ddd;
 alter table bar drop column a, drop column ddd;
@@ -394,6 +424,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -411,6 +442,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column a;
 alter table bar drop column b, drop column a;
@@ -420,6 +452,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -437,6 +470,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column c;
 alter table bar drop column b, drop column c;
@@ -446,6 +480,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -463,6 +498,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column d;
 alter table bar drop column b, drop column d;
@@ -472,6 +508,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -489,6 +526,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column aaa;
 alter table bar drop column b, drop column aaa;
@@ -498,6 +536,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -515,6 +554,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column bbb;
 alter table bar drop column b, drop column bbb;
@@ -524,6 +564,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -541,6 +582,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column ccc;
 alter table bar drop column b, drop column ccc;
@@ -550,6 +592,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -567,6 +610,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column ddd;
 alter table bar drop column b, drop column ddd;
@@ -576,6 +620,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -593,6 +638,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c, drop column a;
 alter table bar drop column c, drop column a;
@@ -602,6 +648,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -619,6 +666,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c, drop column b;
 alter table bar drop column c, drop column b;
@@ -628,6 +676,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -645,6 +694,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c, drop column d;
 alter table bar drop column c, drop column d;
@@ -654,6 +704,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -671,6 +722,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c, drop column aaa;
 alter table bar drop column c, drop column aaa;
@@ -680,6 +732,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -697,6 +750,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c, drop column bbb;
 alter table bar drop column c, drop column bbb;
@@ -706,6 +760,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -723,6 +778,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c, drop column ccc;
 alter table bar drop column c, drop column ccc;
@@ -732,6 +788,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -749,6 +806,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column c, drop column ddd;
 alter table bar drop column c, drop column ddd;
@@ -758,6 +816,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -775,6 +834,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d, drop column a;
 alter table bar drop column d, drop column a;
@@ -784,6 +844,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -801,6 +862,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d, drop column b;
 alter table bar drop column d, drop column b;
@@ -810,6 +872,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -827,6 +890,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d, drop column c;
 alter table bar drop column d, drop column c;
@@ -836,6 +900,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -853,6 +918,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d, drop column aaa;
 alter table bar drop column d, drop column aaa;
@@ -862,6 +928,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -879,6 +946,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d, drop column bbb;
 alter table bar drop column d, drop column bbb;
@@ -888,6 +956,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -905,6 +974,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d, drop column ccc;
 alter table bar drop column d, drop column ccc;
@@ -914,6 +984,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -931,6 +1002,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column d, drop column ddd;
 alter table bar drop column d, drop column ddd;
@@ -940,6 +1012,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -957,6 +1030,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column a;
 alter table bar drop column aaa, drop column a;
@@ -966,6 +1040,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -983,6 +1058,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column b;
 alter table bar drop column aaa, drop column b;
@@ -992,6 +1068,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1009,6 +1086,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column c;
 alter table bar drop column aaa, drop column c;
@@ -1018,6 +1096,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1035,6 +1114,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column d;
 alter table bar drop column aaa, drop column d;
@@ -1044,6 +1124,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1061,6 +1142,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column bbb;
 alter table bar drop column aaa, drop column bbb;
@@ -1070,6 +1152,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1087,6 +1170,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column ccc;
 alter table bar drop column aaa, drop column ccc;
@@ -1096,6 +1180,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1113,6 +1198,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column ddd;
 alter table bar drop column aaa, drop column ddd;
@@ -1122,6 +1208,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1139,6 +1226,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column a;
 alter table bar drop column bbb, drop column a;
@@ -1148,6 +1236,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1165,6 +1254,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column b;
 alter table bar drop column bbb, drop column b;
@@ -1174,6 +1264,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1191,6 +1282,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column c;
 alter table bar drop column bbb, drop column c;
@@ -1200,6 +1292,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1217,6 +1310,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column d;
 alter table bar drop column bbb, drop column d;
@@ -1226,6 +1320,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1243,6 +1338,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column aaa;
 alter table bar drop column bbb, drop column aaa;
@@ -1252,6 +1348,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1269,6 +1366,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column ccc;
 alter table bar drop column bbb, drop column ccc;
@@ -1278,6 +1376,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1295,6 +1394,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column bbb, drop column ddd;
 alter table bar drop column bbb, drop column ddd;
@@ -1304,6 +1404,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1321,6 +1422,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column a;
 alter table bar drop column ccc, drop column a;
@@ -1330,6 +1432,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1347,6 +1450,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column b;
 alter table bar drop column ccc, drop column b;
@@ -1356,6 +1460,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1373,6 +1478,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column c;
 alter table bar drop column ccc, drop column c;
@@ -1382,6 +1488,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1399,6 +1506,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column d;
 alter table bar drop column ccc, drop column d;
@@ -1408,6 +1516,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1425,6 +1534,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column aaa;
 alter table bar drop column ccc, drop column aaa;
@@ -1434,6 +1544,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1451,6 +1562,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column bbb;
 alter table bar drop column ccc, drop column bbb;
@@ -1460,6 +1572,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1477,6 +1590,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ccc, drop column ddd;
 alter table bar drop column ccc, drop column ddd;
@@ -1486,6 +1600,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1503,6 +1618,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column a;
 alter table bar drop column ddd, drop column a;
@@ -1512,6 +1628,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1529,6 +1646,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column b;
 alter table bar drop column ddd, drop column b;
@@ -1538,6 +1656,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1555,6 +1674,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column c;
 alter table bar drop column ddd, drop column c;
@@ -1564,6 +1684,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1581,6 +1702,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column d;
 alter table bar drop column ddd, drop column d;
@@ -1590,6 +1712,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1607,6 +1730,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column aaa;
 alter table bar drop column ddd, drop column aaa;
@@ -1616,6 +1740,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1633,6 +1758,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column bbb;
 alter table bar drop column ddd, drop column bbb;
@@ -1642,6 +1768,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1659,6 +1786,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column ddd, drop column ccc;
 alter table bar drop column ddd, drop column ccc;
@@ -1668,6 +1796,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1685,6 +1814,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column b, drop column c;
 alter table bar drop column a, drop column b, drop column c;
@@ -1694,6 +1824,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1711,6 +1842,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column b, drop column d;
 alter table bar drop column a, drop column b, drop column d;
@@ -1720,6 +1852,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1737,6 +1870,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column c, drop column d;
 alter table bar drop column a, drop column c, drop column d;
@@ -1746,6 +1880,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1763,6 +1898,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column b, drop column c, drop column d;
 alter table bar drop column b, drop column c, drop column d;
@@ -1772,6 +1908,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1789,6 +1926,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column a, drop column b, drop column c, drop column d;
 alter table bar drop column a, drop column b, drop column c, drop column d;
@@ -1798,6 +1936,7 @@ drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1815,6 +1954,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 include/diff_tables.inc [test.foo, test.bar]
 alter table foo drop column aaa, drop column bbb, drop column ccc, drop column ddd;
 alter table bar drop column aaa, drop column bbb, drop column ccc, drop column ddd;

storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_add2.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 #--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 

storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_blob_drop.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 #--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
@@ -13,11 +15,13 @@ let $diff_tables= test.foo, test.bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aa;
 alter table bar drop column aa;
@@ -28,11 +32,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bb;
 alter table bar drop column bb;
@@ -43,11 +49,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column cc;
 alter table bar drop column cc;
@@ -58,11 +66,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column dd;
 alter table bar drop column dd;
@@ -73,11 +83,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aa, drop column bb;
 alter table bar drop column aa, drop column bb;
@@ -88,11 +100,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aa, drop column cc;
 alter table bar drop column aa, drop column cc;
@@ -103,11 +117,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aa, drop column dd;
 alter table bar drop column aa, drop column dd;
@@ -118,11 +134,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bb, drop column aa;
 alter table bar drop column bb, drop column aa;
@@ -133,11 +151,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bb, drop column cc;
 alter table bar drop column bb, drop column cc;
@@ -148,11 +168,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bb, drop column dd;
 alter table bar drop column bb, drop column dd;
@@ -163,11 +185,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column cc, drop column aa;
 alter table bar drop column cc, drop column aa;
@@ -178,11 +202,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column cc, drop column bb;
 alter table bar drop column cc, drop column bb;
@@ -193,11 +219,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column cc, drop column dd;
 alter table bar drop column cc, drop column dd;
@@ -208,11 +236,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column dd, drop column aa;
 alter table bar drop column dd, drop column aa;
@@ -223,11 +253,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column dd, drop column bb;
 alter table bar drop column dd, drop column bb;
@@ -238,11 +270,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column dd, drop column cc;
 alter table bar drop column dd, drop column cc;
@@ -253,11 +287,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aa, drop column bb, drop column cc;
 alter table bar drop column aa, drop column bb, drop column cc;
@@ -268,11 +304,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aa, drop column bb, drop column dd;
 alter table bar drop column aa, drop column bb, drop column dd;
@@ -283,11 +321,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aa, drop column cc, drop column dd;
 alter table bar drop column aa, drop column cc, drop column dd;
@@ -298,11 +338,13 @@ drop table foo; drop table bar;
 create table foo (aa blob, bb longblob, cc tinyblob, dd mediumblob) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values ("adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,"oifds",NULL,"fdsjfds");
 insert into foo values ("rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bb, drop column cc, drop column dd;
 alter table bar drop column bb, drop column cc, drop column dd;

storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_fixed_drop.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 #--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 

storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_add.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 #--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 

storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_all_var_drop.test

@@ -1,3 +1,5 @@
+# This test takes rather long time so let us run it only in --big-test mode
+--source include/big_test.inc
 #--source include/have_tokudb.inc
 SET DEFAULT_STORAGE_ENGINE='tokudb'; 
 
@@ -13,11 +15,13 @@ let $diff_tables= test.foo, test.bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa;
 alter table bar drop column aaa;
@@ -28,11 +32,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb;
 alter table bar drop column bbb;
@@ -43,11 +49,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc;
 alter table bar drop column ccc;
@@ -58,11 +66,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd;
 alter table bar drop column ddd;
@@ -73,11 +83,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column bbb;
 alter table bar drop column aaa, drop column bbb;
@@ -88,11 +100,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column ccc;
 alter table bar drop column aaa, drop column ccc;
@@ -103,11 +117,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column ddd;
 alter table bar drop column aaa, drop column ddd;
@@ -118,11 +134,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column aaa;
 alter table bar drop column bbb, drop column aaa;
@@ -133,11 +151,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column ccc;
 alter table bar drop column bbb, drop column ccc;
@@ -148,11 +168,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column ddd;
 alter table bar drop column bbb, drop column ddd;
@@ -163,11 +185,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column aaa;
 alter table bar drop column ccc, drop column aaa;
@@ -178,11 +202,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column bbb;
 alter table bar drop column ccc, drop column bbb;
@@ -193,11 +219,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column ddd;
 alter table bar drop column ccc, drop column ddd;
@@ -208,11 +236,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column aaa;
 alter table bar drop column ddd, drop column aaa;
@@ -223,11 +253,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column bbb;
 alter table bar drop column ddd, drop column bbb;
@@ -238,11 +270,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column ccc;
 alter table bar drop column ddd, drop column ccc;
@@ -253,11 +287,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column bbb, drop column ccc;
 alter table bar drop column aaa, drop column bbb, drop column ccc;
@@ -268,11 +304,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column bbb, drop column ddd;
 alter table bar drop column aaa, drop column bbb, drop column ddd;
@@ -283,11 +321,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column ccc, drop column ddd;
 alter table bar drop column aaa, drop column ccc, drop column ddd;
@@ -298,11 +338,13 @@ drop table foo; drop table bar;
 create table foo (aaa varchar(12), bbb varbinary(20), ccc varchar(50), ddd varchar(3000)) engine=TokuDB;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL);
 insert into foo values (-1,NULL,'2008-1-1',NULL);
 insert into foo values (NULL,12345678987,NULL,1);
 insert into foo values (2,20,'1999-11-11',0);
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column ccc, drop column ddd;
 alter table bar drop column bbb, drop column ccc, drop column ddd;

storage/tokudb/mysql-test/tokudb_alter_table/t/hcad_fixedvar_drop.test

@@ -13,6 +13,7 @@ let $diff_tables= test.foo, test.bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -30,6 +31,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a;
 alter table bar drop column a;
@@ -40,6 +42,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -57,6 +60,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b;
 alter table bar drop column b;
@@ -67,6 +71,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -84,6 +89,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c;
 alter table bar drop column c;
@@ -94,6 +100,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -111,6 +118,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d;
 alter table bar drop column d;
@@ -121,6 +129,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -138,6 +147,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa;
 alter table bar drop column aaa;
@@ -148,6 +158,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -165,6 +176,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb;
 alter table bar drop column bbb;
@@ -175,6 +187,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -192,6 +205,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc;
 alter table bar drop column ccc;
@@ -202,6 +216,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -219,6 +234,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd;
 alter table bar drop column ddd;
@@ -229,6 +245,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -246,6 +263,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column b;
 alter table bar drop column a, drop column b;
@@ -256,6 +274,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -273,6 +292,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column c;
 alter table bar drop column a, drop column c;
@@ -283,6 +303,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -300,6 +321,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column d;
 alter table bar drop column a, drop column d;
@@ -310,6 +332,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -327,6 +350,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column aaa;
 alter table bar drop column a, drop column aaa;
@@ -337,6 +361,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -354,6 +379,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column bbb;
 alter table bar drop column a, drop column bbb;
@@ -364,6 +390,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -381,6 +408,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column ccc;
 alter table bar drop column a, drop column ccc;
@@ -391,6 +419,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -408,6 +437,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column ddd;
 alter table bar drop column a, drop column ddd;
@@ -418,6 +448,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -435,6 +466,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column a;
 alter table bar drop column b, drop column a;
@@ -445,6 +477,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -462,6 +495,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column c;
 alter table bar drop column b, drop column c;
@@ -472,6 +506,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -489,6 +524,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column d;
 alter table bar drop column b, drop column d;
@@ -499,6 +535,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -516,6 +553,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column aaa;
 alter table bar drop column b, drop column aaa;
@@ -526,6 +564,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -543,6 +582,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column bbb;
 alter table bar drop column b, drop column bbb;
@@ -553,6 +593,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -570,6 +611,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column ccc;
 alter table bar drop column b, drop column ccc;
@@ -580,6 +622,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -597,6 +640,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column ddd;
 alter table bar drop column b, drop column ddd;
@@ -607,6 +651,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -624,6 +669,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c, drop column a;
 alter table bar drop column c, drop column a;
@@ -634,6 +680,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -651,6 +698,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c, drop column b;
 alter table bar drop column c, drop column b;
@@ -661,6 +709,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -678,6 +727,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c, drop column d;
 alter table bar drop column c, drop column d;
@@ -688,6 +738,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -705,6 +756,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c, drop column aaa;
 alter table bar drop column c, drop column aaa;
@@ -715,6 +767,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -732,6 +785,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c, drop column bbb;
 alter table bar drop column c, drop column bbb;
@@ -742,6 +796,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -759,6 +814,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c, drop column ccc;
 alter table bar drop column c, drop column ccc;
@@ -769,6 +825,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -786,6 +843,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column c, drop column ddd;
 alter table bar drop column c, drop column ddd;
@@ -796,6 +854,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -813,6 +872,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d, drop column a;
 alter table bar drop column d, drop column a;
@@ -823,6 +883,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -840,6 +901,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d, drop column b;
 alter table bar drop column d, drop column b;
@@ -850,6 +912,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -867,6 +930,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d, drop column c;
 alter table bar drop column d, drop column c;
@@ -877,6 +941,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -894,6 +959,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d, drop column aaa;
 alter table bar drop column d, drop column aaa;
@@ -904,6 +970,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -921,6 +988,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d, drop column bbb;
 alter table bar drop column d, drop column bbb;
@@ -931,6 +999,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -948,6 +1017,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d, drop column ccc;
 alter table bar drop column d, drop column ccc;
@@ -958,6 +1028,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -975,6 +1046,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column d, drop column ddd;
 alter table bar drop column d, drop column ddd;
@@ -985,6 +1057,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1002,6 +1075,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column a;
 alter table bar drop column aaa, drop column a;
@@ -1012,6 +1086,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1029,6 +1104,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column b;
 alter table bar drop column aaa, drop column b;
@@ -1039,6 +1115,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1056,6 +1133,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column c;
 alter table bar drop column aaa, drop column c;
@@ -1066,6 +1144,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1083,6 +1162,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column d;
 alter table bar drop column aaa, drop column d;
@@ -1093,6 +1173,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1110,6 +1191,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column bbb;
 alter table bar drop column aaa, drop column bbb;
@@ -1120,6 +1202,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1137,6 +1220,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column ccc;
 alter table bar drop column aaa, drop column ccc;
@@ -1147,6 +1231,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1164,6 +1249,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column ddd;
 alter table bar drop column aaa, drop column ddd;
@@ -1174,6 +1260,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1191,6 +1278,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column a;
 alter table bar drop column bbb, drop column a;
@@ -1201,6 +1289,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1218,6 +1307,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column b;
 alter table bar drop column bbb, drop column b;
@@ -1228,6 +1318,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1245,6 +1336,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column c;
 alter table bar drop column bbb, drop column c;
@@ -1255,6 +1347,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1272,6 +1365,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column d;
 alter table bar drop column bbb, drop column d;
@@ -1282,6 +1376,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1299,6 +1394,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column aaa;
 alter table bar drop column bbb, drop column aaa;
@@ -1309,6 +1405,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1326,6 +1423,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column ccc;
 alter table bar drop column bbb, drop column ccc;
@@ -1336,6 +1434,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1353,6 +1452,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column bbb, drop column ddd;
 alter table bar drop column bbb, drop column ddd;
@@ -1363,6 +1463,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1380,6 +1481,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column a;
 alter table bar drop column ccc, drop column a;
@@ -1390,6 +1492,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1407,6 +1510,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column b;
 alter table bar drop column ccc, drop column b;
@@ -1417,6 +1521,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1434,6 +1539,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column c;
 alter table bar drop column ccc, drop column c;
@@ -1444,6 +1550,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1461,6 +1568,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column d;
 alter table bar drop column ccc, drop column d;
@@ -1471,6 +1579,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1488,6 +1597,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column aaa;
 alter table bar drop column ccc, drop column aaa;
@@ -1498,6 +1608,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1515,6 +1626,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column bbb;
 alter table bar drop column ccc, drop column bbb;
@@ -1525,6 +1637,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1542,6 +1655,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ccc, drop column ddd;
 alter table bar drop column ccc, drop column ddd;
@@ -1552,6 +1666,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1569,6 +1684,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column a;
 alter table bar drop column ddd, drop column a;
@@ -1579,6 +1695,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1596,6 +1713,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column b;
 alter table bar drop column ddd, drop column b;
@@ -1606,6 +1724,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1623,6 +1742,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column c;
 alter table bar drop column ddd, drop column c;
@@ -1633,6 +1753,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1650,6 +1771,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column d;
 alter table bar drop column ddd, drop column d;
@@ -1660,6 +1782,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1677,6 +1800,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column aaa;
 alter table bar drop column ddd, drop column aaa;
@@ -1687,6 +1811,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1704,6 +1829,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column bbb;
 alter table bar drop column ddd, drop column bbb;
@@ -1714,6 +1840,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1731,6 +1858,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column ddd, drop column ccc;
 alter table bar drop column ddd, drop column ccc;
@@ -1741,6 +1869,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1758,6 +1887,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column b, drop column c;
 alter table bar drop column a, drop column b, drop column c;
@@ -1768,6 +1898,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1785,6 +1916,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column b, drop column d;
 alter table bar drop column a, drop column b, drop column d;
@@ -1795,6 +1927,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1812,6 +1945,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column c, drop column d;
 alter table bar drop column a, drop column c, drop column d;
@@ -1822,6 +1956,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1839,6 +1974,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column b, drop column c, drop column d;
 alter table bar drop column b, drop column c, drop column d;
@@ -1849,6 +1985,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1866,6 +2003,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column a, drop column b, drop column c, drop column d;
 alter table bar drop column a, drop column b, drop column c, drop column d;
@@ -1876,6 +2014,7 @@ drop table foo; drop table bar;
 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;
 create table bar like foo;
 alter table bar engine=MyISAM;
+begin;
 insert into foo values (NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 insert into foo values (NULL,NULL,NULL,NULL,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (NULL,NULL,NULL,NULL,NULL,"oifds",NULL,"fdsjfds");
@@ -1893,6 +2032,7 @@ insert into foo values (2,20,'1999-11-11',0,"adsf",NULL,"hjfdshj",NULL);
 insert into foo values (2,20,'1999-11-11',0,NULL,"oifds",NULL,"fdsjfds");
 insert into foo values (2,20,'1999-11-11',0,"rewoiu","fds","fr","oiufdsrew");
 insert into bar select * from foo;
+commit;
 source include/diff_tables.inc;
 alter table foo drop column aaa, drop column bbb, drop column ccc, drop column ddd;
 alter table bar drop column aaa, drop column bbb, drop column ccc, drop column ddd;