refs #5545 run mysql mvcc tests run on 5.5 and 5.6

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

mysql-test/suite/tokudb.mvcc/r/2808-read-committed.result

 # Establish connection conn1 (user = root)
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 DROP TABLE IF EXISTS foo,foo_isam;
 set session transaction isolation level read committed;
 create table foo ( a int, b int, primary key (a));

mysql-test/suite/tokudb.mvcc/r/2808-read-uncommitted.result

 # Establish connection conn1 (user = root)
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 DROP TABLE IF EXISTS foo,foo_isam;
 set session transaction isolation level read uncommitted;
 create table foo ( a int, b int, primary key (a));

mysql-test/suite/tokudb.mvcc/r/checksum-locks.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 create table foo (a int)engine=TokuDB;

mysql-test/suite/tokudb.mvcc/r/mvcc-1.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;
 create table foo (a int);

mysql-test/suite/tokudb.mvcc/r/mvcc-10.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB;

mysql-test/suite/tokudb.mvcc/r/mvcc-11.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 create table foo (a int) engine=TokuDB;

mysql-test/suite/tokudb.mvcc/r/mvcc-12.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level serializable;

mysql-test/suite/tokudb.mvcc/r/mvcc-13.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo,foo1;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-14.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo,foo1;
 set session transaction isolation level read uncommitted;

mysql-test/suite/tokudb.mvcc/r/mvcc-15.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo,foo1;
 set session transaction isolation level serializable;

mysql-test/suite/tokudb.mvcc/r/mvcc-16.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo,foo1;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-17.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session tokudb_load_save_space=0;

mysql-test/suite/tokudb.mvcc/r/mvcc-18.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session tokudb_load_save_space=1;

mysql-test/suite/tokudb.mvcc/r/mvcc-2.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.mvcc/r/mvcc-21.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB;

mysql-test/suite/tokudb.mvcc/r/mvcc-22.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB;

mysql-test/suite/tokudb.mvcc/r/mvcc-23.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB;

mysql-test/suite/tokudb.mvcc/r/mvcc-24.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-25.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo,bar;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-26.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;
 create table foo (a int);

mysql-test/suite/tokudb.mvcc/r/mvcc-28.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level serializable;

mysql-test/suite/tokudb.mvcc/r/mvcc-29.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-3.result

 set session transaction isolation level repeatable read;
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-30.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-31.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-33.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;
@@ -28,7 +28,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -49,7 +49,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c

mysql-test/suite/tokudb.mvcc/r/mvcc-34.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;
@@ -28,7 +28,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -39,7 +39,7 @@ begin;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -48,7 +48,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -56,7 +56,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -65,7 +65,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c

mysql-test/suite/tokudb.mvcc/r/mvcc-35.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level read committed;
@@ -28,7 +28,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -39,7 +39,7 @@ begin;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -48,7 +48,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -56,7 +56,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -65,7 +65,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c

mysql-test/suite/tokudb.mvcc/r/mvcc-36.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level serializable;
@@ -28,7 +28,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -39,7 +39,7 @@ begin;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # timeout
 select * from foo where b=50;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
@@ -47,7 +47,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -55,7 +55,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -64,7 +64,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c

mysql-test/suite/tokudb.mvcc/r/mvcc-37.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level read uncommitted;
@@ -28,7 +28,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,500)
 select * from foo where b=50;
 a	b	c
@@ -39,7 +39,7 @@ begin;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -48,7 +48,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -56,7 +56,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c
@@ -65,7 +65,7 @@ commit;
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should get (5,50,1515)
 select * from foo where b=50;
 a	b	c

mysql-test/suite/tokudb.mvcc/r/mvcc-38.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo, foo_isam;
 set session transaction isolation level repeatable read;
@@ -29,7 +29,7 @@ a	b	c
 # should use key b
 explain select * from foo where b=50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 # should grab a read lock on the main table on (5,50,500)
 insert into foo_isam select * from foo where b=50;
 # should get (5,50,500)

mysql-test/suite/tokudb.mvcc/r/mvcc-39.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session tokudb_load_save_space=1;

mysql-test/suite/tokudb.mvcc/r/mvcc-4.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.mvcc/r/mvcc-40.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session tokudb_load_save_space=0;

mysql-test/suite/tokudb.mvcc/r/mvcc-5.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.mvcc/r/mvcc-6.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-7.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-8.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo, foo_isam;
 set session transaction isolation level repeatable read;
@@ -17,7 +17,7 @@ create table foo_isam (a int, b int, c int);
 # should use key b
 explain select * from foo where b=30;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	foo	ref	b	b	5	const	1	Using where
+1	SIMPLE	foo	ref	b	b	5	const	1	
 begin;
 insert into foo_isam select * from foo where b=30;
 set session transaction isolation level repeatable read;

mysql-test/suite/tokudb.mvcc/r/mvcc-9.result

-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 # Establish connection conn1 (user = root)
 DROP TABLE IF EXISTS foo;
 create table foo (a int, b varchar (100), primary key (a)) engine=TokuDB;

mysql-test/suite/tokudb.mvcc/t/2808-read-committed.test

@@ -3,7 +3,7 @@
 #--source include/have_tokudb.inc
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,foo_isam;

mysql-test/suite/tokudb.mvcc/t/2808-read-uncommitted.test

@@ -3,7 +3,7 @@
 #--source include/have_tokudb.inc
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo,foo_isam;

mysql-test/suite/tokudb.mvcc/t/checksum-locks.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-1.test

 # ticket 895 is a query optimization problem with the primary key
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.mvcc/t/mvcc-10.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-11.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-12.test

 # simple serializable test
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-13.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-14.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-15.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-16.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-17.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-18.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-19.test

@@ -2,7 +2,7 @@
 
 #--source include/have_tokudb.inc
 --source include/not_5_5.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-2.test

 # test simple MVCC, that a transaction does not read something committed after it
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 
 --echo # Establish connection conn1 (user = root)

mysql-test/suite/tokudb.mvcc/t/mvcc-20.test

@@ -3,7 +3,7 @@
 #--source include/have_tokudb.inc
 --source include/not_5_5.inc
 
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-21.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-22.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-23.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-24.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-25.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-26.test

 # ticket 895 is a query optimization problem with the primary key
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --disable_warnings
 DROP TABLE IF EXISTS foo;

mysql-test/suite/tokudb.mvcc/t/mvcc-27.test

@@ -2,7 +2,7 @@
 
 #--source include/have_tokudb.inc
 --source include/not_5_5.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-28.test

 # verify that serializable properly reads provisional delete and actual value
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-29.test

 # simple keyrange64 test, ensure that it reads number of leafentries in the system
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-3.test

@@ -2,7 +2,7 @@
 
 set session transaction isolation level repeatable read;
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-30.test

 # simple keyrange64 test, ensure that it reads number of leafentries in the system
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-31.test

 # simple keyrange64 test, ensure that it reads number of leafentries in the system
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-33.test

 # verify a db_get sees data that transaction inserted, and that it does not read data that is too new
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-34.test

 # verify a db_get does not read a transaction's data because it is in live list
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-35.test

 # verify a db_get does not read a read committed transaction's data because it is in live list
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-36.test

 # verify a db_get does not read a read committed transaction's data because it is in live list
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-37.test

 # verify a db_get does not read a read committed transaction's data because it is in live list
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-38.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-39.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-4.test

 # test that we read data that was committed before we began
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 
 --echo # Establish connection conn1 (user = root)

mysql-test/suite/tokudb.mvcc/t/mvcc-40.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-5.test

 # verify that repeatable read uses one snapshot, whereas read committed keeps taking new ones
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 set session transaction isolation level repeatable read;
 
 --echo # Establish connection conn1 (user = root)

mysql-test/suite/tokudb.mvcc/t/mvcc-6.test

 # make sure reads done during writes take read locks
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-7.test

 # make sure reads done during writes take read locks
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-8.test

 # verify that serializable get of a repeatable read transaction grabs read lock
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);

mysql-test/suite/tokudb.mvcc/t/mvcc-9.test

 # ticket 895 is a query optimization problem with the primary key
 
 #--source include/have_tokudb.inc
-SET STORAGE_ENGINE = 'tokudb';
+SET DEFAULT_STORAGE_ENGINE = 'tokudb';
 
 --echo # Establish connection conn1 (user = root)
 connect (conn1,localhost,root,,);