11 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-mdev7046.test b/mysql-test/suite/innodb/t/innodb-mdev7046.test
index 27c140689c1..a8c8b7da2db 100644
--- a/mysql-test/suite/innodb/t/innodb-mdev7046.test
+++ b/mysql-test/suite/innodb/t/innodb-mdev7046.test
@@ -35,7 +35,7 @@ drop database test;
 create database test;
 use test;
 
-SET @@session.storage_engine=MYISAM;
+SET @@session.default_storage_engine=MYISAM;
 --error 0,1,1103
 CREATE TABLE t1(id INT,purchased DATE)PARTITION BY RANGE(YEAR(purchased)) SUBPARTITION BY HASH(TO_DAYS(purchased)) SUBPARTITIONS 2 (PARTITION p0 VALUES LESS THAN MAXVALUE (SUBPARTITION sp0 DATA DIRECTORY='/tmp/not-existing' INDEX DIRECTORY='/tmp/not-existing',SUBPARTITION sp1));
 drop table if exists t1;
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index ab12cac5ea1..6fd2cdc74d2 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -1339,8 +1339,8 @@ SELECT variable_value - @innodb_row_lock_time_avg_orig FROM information_schema.g
 # Test varchar
 #
 
-let $default=`select @@storage_engine`;
-set storage_engine=INNODB;
+let $default=`select @@default_storage_engine`;
+set default_storage_engine=INNODB;
 source include/varchar.inc;
 
 #
diff --git a/mysql-test/suite/innodb/t/innodb_bug35220.test b/mysql-test/suite/innodb/t/innodb_bug35220.test
index 29c432fe987..8ad6b3070c3 100644
--- a/mysql-test/suite/innodb/t/innodb_bug35220.test
+++ b/mysql-test/suite/innodb/t/innodb_bug35220.test
@@ -4,7 +4,7 @@
 # http://bugs.mysql.com/35220
 #
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not produce errors
 -- disable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb_bug38231.test b/mysql-test/suite/innodb/t/innodb_bug38231.test
index ba4e1c62e06..0c139c338c4 100644
--- a/mysql-test/suite/innodb/t/innodb_bug38231.test
+++ b/mysql-test/suite/innodb/t/innodb_bug38231.test
@@ -9,7 +9,7 @@
 # preceded by --send
 -- source include/not_embedded.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not crash the server
 -- disable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb_bug39438.test b/mysql-test/suite/innodb/t/innodb_bug39438.test
index 3a838da8419..635d65f045b 100644
--- a/mysql-test/suite/innodb/t/innodb_bug39438.test
+++ b/mysql-test/suite/innodb/t/innodb_bug39438.test
@@ -8,7 +8,7 @@
 # works with innodb_file_per_table.
 #
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we care only that the following SQL commands do not crash the server
 -- disable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb_ctype_big5.test b/mysql-test/suite/innodb/t/innodb_ctype_big5.test
index 684a97983e5..551d6add54b 100644
--- a/mysql-test/suite/innodb/t/innodb_ctype_big5.test
+++ b/mysql-test/suite/innodb/t/innodb_ctype_big5.test
@@ -1,7 +1,7 @@
 --source include/have_innodb.inc
 --source include/have_big5.inc
 
-SET STORAGE_ENGINE=InnoDB;
+SET DEFAULT_STORAGE_ENGINE=InnoDB;
 
 --echo #
 --echo # Start of 10.2 tests
diff --git a/mysql-test/suite/innodb/t/innodb_ctype_latin1.test b/mysql-test/suite/innodb/t/innodb_ctype_latin1.test
index 0f88ae3212d..1eb9864f3b9 100644
--- a/mysql-test/suite/innodb/t/innodb_ctype_latin1.test
+++ b/mysql-test/suite/innodb/t/innodb_ctype_latin1.test
@@ -1,6 +1,6 @@
 --source include/have_innodb.inc
 
-SET STORAGE_ENGINE=InnoDB;
+SET DEFAULT_STORAGE_ENGINE=InnoDB;
 
 --echo #
 --echo # Start of 10.2 tests
diff --git a/mysql-test/suite/innodb/t/innodb_ctype_utf8.test b/mysql-test/suite/innodb/t/innodb_ctype_utf8.test
index 105f771d8b3..c3abaa99731 100644
--- a/mysql-test/suite/innodb/t/innodb_ctype_utf8.test
+++ b/mysql-test/suite/innodb/t/innodb_ctype_utf8.test
@@ -1,6 +1,6 @@
 --source include/have_innodb.inc
 
-SET STORAGE_ENGINE=InnoDB;
+SET DEFAULT_STORAGE_ENGINE=InnoDB;
 
 --echo #
 --echo # Start of 10.2 tests
diff --git a/mysql-test/suite/innodb/t/innodb_gis.test b/mysql-test/suite/innodb/t/innodb_gis.test
index cb04c15f0b6..c895d0a2af2 100644
--- a/mysql-test/suite/innodb/t/innodb_gis.test
+++ b/mysql-test/suite/innodb/t/innodb_gis.test
@@ -1,5 +1,5 @@
 --source include/have_innodb.inc
-SET storage_engine=innodb;
+SET default_storage_engine=innodb;
 --source include/gis_generic.inc
 --source include/gis_keys.inc
 
diff --git a/mysql-test/suite/innodb/t/innodb_information_schema.test b/mysql-test/suite/innodb/t/innodb_information_schema.test
index da7ee016f29..395fa779773 100644
--- a/mysql-test/suite/innodb/t/innodb_information_schema.test
+++ b/mysql-test/suite/innodb/t/innodb_information_schema.test
@@ -15,7 +15,7 @@
 -- disable_query_log
 -- disable_result_log
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 -- disable_warnings
 DROP TABLE IF EXISTS t_min, t_max;
diff --git a/mysql-test/suite/innodb/t/innodb_trx_weight.test b/mysql-test/suite/innodb/t/innodb_trx_weight.test
index 8af311a532e..8dc23e99585 100644
--- a/mysql-test/suite/innodb/t/innodb_trx_weight.test
+++ b/mysql-test/suite/innodb/t/innodb_trx_weight.test
@@ -8,7 +8,7 @@
 
 -- source include/have_innodb.inc
 
-SET storage_engine=InnoDB;
+SET default_storage_engine=InnoDB;
 
 # we do not really care about what gets printed, we are only
 # interested in getting the deadlock resolved according to our