Post-push fixup for WL#5349

InnoDB came in a new version "simultanously" with the
commit.  This patch is a minor change to the new innodb
regression test suite. 

15 files changed, 43 insertions, 23 deletions

diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-44030-master.opt b/mysql-test/suite/innodb/t/innodb-autoinc-44030-master.opt
new file mode 100644
index 00000000000..303ec1be1d0
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb-autoinc-44030-master.opt
@@ -0,0 +1,3 @@
+--default-storage-engine=MyISAM
+--innodb-strict-mode=0
+--innodb-file-per-table=0
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-master.opt b/mysql-test/suite/innodb/t/innodb-autoinc-master.opt
new file mode 100644
index 00000000000..303ec1be1d0
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb-autoinc-master.opt
@@ -0,0 +1,3 @@
+--default-storage-engine=MyISAM
+--innodb-strict-mode=0
+--innodb-file-per-table=0
diff --git a/mysql-test/suite/innodb/t/innodb-master.opt b/mysql-test/suite/innodb/t/innodb-master.opt
index 4901efb416c..8b247193a4e 100644
--- a/mysql-test/suite/innodb/t/innodb-master.opt
+++ b/mysql-test/suite/innodb/t/innodb-master.opt
@@ -1 +1,4 @@
 --binlog_cache_size=32768 --innodb_lock_wait_timeout=1
+--default-storage-engine=MyISAM
+--innodb-strict-mode=0
+--innodb-file-per-table=0
diff --git a/mysql-test/suite/innodb/t/innodb-system-table-view-master.opt b/mysql-test/suite/innodb/t/innodb-system-table-view-master.opt
new file mode 100644
index 00000000000..303ec1be1d0
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innodb-system-table-view-master.opt
@@ -0,0 +1,3 @@
+--default-storage-engine=MyISAM
+--innodb-strict-mode=0
+--innodb-file-per-table=0
diff --git a/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt b/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
new file mode 100644
index 00000000000..96f0ce3f36c
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
@@ -0,0 +1 @@
+--default-storage-engine=MyISAM
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_row_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_mixed_row_innodb-master.opt
new file mode 100644
index 00000000000..96f0ce3f36c
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mixed_row_innodb-master.opt
@@ -0,0 +1 @@
+--default-storage-engine=MyISAM
diff --git a/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt
index e0d075c3fbd..773ec62bef2 100644
--- a/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt
+++ b/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt
@@ -1 +1,2 @@
 --skip-external-locking
+--default-storage-engine=MyISAM
diff --git a/mysql-test/suite/rpl/t/rpl_sync-master.opt b/mysql-test/suite/rpl/t/rpl_sync-master.opt
new file mode 100644
index 00000000000..ad327ce0454
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_sync-master.opt
@@ -0,0 +1,2 @@
+--default-storage-engine=MyISAM
+--innodb-file-per-table=0
diff --git a/mysql-test/suite/rpl/t/rpl_sync-slave.opt b/mysql-test/suite/rpl/t/rpl_sync-slave.opt
index 972f9ef8af9..7d6147ed59a 100644
--- a/mysql-test/suite/rpl/t/rpl_sync-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_sync-slave.opt
@@ -1 +1 @@
---sync-relay-log-info=1 --relay-log-recovery=1 --innodb_file_format_check='ON'
+--sync-relay-log-info=1 --relay-log-recovery=1 --innodb_file_format_check='ON' --default-storage-engine=MyISAM --innodb-file-per-table=0
diff --git a/mysql-test/suite/rpl/t/rpl_temp_temporary-master.opt b/mysql-test/suite/rpl/t/rpl_temp_temporary-master.opt
new file mode 100644
index 00000000000..96f0ce3f36c
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_temp_temporary-master.opt
@@ -0,0 +1 @@
+--default-storage-engine=MyISAM
diff --git a/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
index 58e009ea705..41369038cf6 100644
--- a/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
@@ -1,28 +1,28 @@
 SET @start_global_value = @@global.innodb_file_format;
 SELECT @start_global_value;
 @start_global_value
-Antelope
+Barracuda
 Valid values are 'Antelope' and 'Barracuda' 
 select @@global.innodb_file_format in ('Antelope', 'Barracuda');
 @@global.innodb_file_format in ('Antelope', 'Barracuda')
 1
 select @@global.innodb_file_format;
 @@global.innodb_file_format
-Antelope
+Barracuda
 select @@session.innodb_file_format;
 ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable
 show global variables like 'innodb_file_format';
 Variable_name	Value
-innodb_file_format	Antelope
+innodb_file_format	Barracuda
 show session variables like 'innodb_file_format';
 Variable_name	Value
-innodb_file_format	Antelope
+innodb_file_format	Barracuda
 select * from information_schema.global_variables where variable_name='innodb_file_format';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_FILE_FORMAT	Antelope
+INNODB_FILE_FORMAT	Barracuda
 select * from information_schema.session_variables where variable_name='innodb_file_format';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_FILE_FORMAT	Antelope
+INNODB_FILE_FORMAT	Barracuda
 set global innodb_file_format='Antelope';
 select @@global.innodb_file_format;
 @@global.innodb_file_format
@@ -56,4 +56,4 @@ ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Salmon'
 SET @@global.innodb_file_format = @start_global_value;
 SELECT @@global.innodb_file_format;
 @@global.innodb_file_format
-Antelope
+Barracuda
diff --git a/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result b/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
index 200f9166215..5e55faa99c9 100644
--- a/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
@@ -1,32 +1,32 @@
 SET @start_global_value = @@global.innodb_strict_mode;
 SELECT @start_global_value;
 @start_global_value
-0
+1
 Valid values are 'ON' and 'OFF' 
 select @@global.innodb_strict_mode in (0, 1);
 @@global.innodb_strict_mode in (0, 1)
 1
 select @@global.innodb_strict_mode;
 @@global.innodb_strict_mode
-0
+1
 select @@session.innodb_strict_mode in (0, 1);
 @@session.innodb_strict_mode in (0, 1)
 1
 select @@session.innodb_strict_mode;
 @@session.innodb_strict_mode
-0
+1
 show global variables like 'innodb_strict_mode';
 Variable_name	Value
-innodb_strict_mode	OFF
+innodb_strict_mode	ON
 show session variables like 'innodb_strict_mode';
 Variable_name	Value
-innodb_strict_mode	OFF
+innodb_strict_mode	ON
 select * from information_schema.global_variables where variable_name='innodb_strict_mode';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_STRICT_MODE	OFF
+INNODB_STRICT_MODE	ON
 select * from information_schema.session_variables where variable_name='innodb_strict_mode';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_STRICT_MODE	OFF
+INNODB_STRICT_MODE	ON
 set global innodb_strict_mode='OFF';
 set session innodb_strict_mode='OFF';
 select @@global.innodb_strict_mode;
@@ -117,4 +117,4 @@ INNODB_STRICT_MODE	ON
 SET @@global.innodb_strict_mode = @start_global_value;
 SELECT @@global.innodb_strict_mode;
 @@global.innodb_strict_mode
-0
+1
diff --git a/mysql-test/suite/sys_vars/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
index 5e80f1343b7..6f10ec475a0 100644
--- a/mysql-test/suite/sys_vars/r/storage_engine_basic.result
+++ b/mysql-test/suite/sys_vars/r/storage_engine_basic.result
@@ -1,22 +1,22 @@
 SET @start_global_value = @@global.storage_engine;
 SELECT @start_global_value;
 @start_global_value
-MyISAM
+InnoDB
 SET @start_session_value = @@session.storage_engine;
 SELECT @start_session_value;
 @start_session_value
-MyISAM
+InnoDB
 '#--------------------FN_DYNVARS_005_01-------------------------#'
 SET @@global.storage_engine = INNODB;
 SET @@global.storage_engine = DEFAULT;
 SELECT @@global.storage_engine;
 @@global.storage_engine
-MyISAM
+InnoDB
 SET @@session.storage_engine = INNODB;
 SET @@session.storage_engine = DEFAULT;
 SELECT @@session.storage_engine;
 @@session.storage_engine
-MyISAM
+InnoDB
 '#--------------------FN_DYNVARS_005_02-------------------------#'
 SET @@global.storage_engine = MYISAM;
 SELECT @@global.storage_engine;
@@ -110,8 +110,8 @@ SET @@storage_engine = @start_global_value;
 SET @@global.storage_engine = @start_global_value;
 SELECT @@global.storage_engine;
 @@global.storage_engine
-MyISAM
+InnoDB
 SET @@session.storage_engine = @start_session_value;
 SELECT @@session.storage_engine;
 @@session.storage_engine
-MyISAM
+InnoDB
diff --git a/mysql-test/t/crash_commit_before-master.opt b/mysql-test/t/crash_commit_before-master.opt
index a745693594e..cd2ae9b1455 100644
--- a/mysql-test/t/crash_commit_before-master.opt
+++ b/mysql-test/t/crash_commit_before-master.opt
@@ -1,2 +1,3 @@
 --skip-stack-trace --skip-core-file
-
+--default-storage-engine=MyISAM
+--innodb-file-per-table=0
diff --git a/mysql-test/t/lock_sync-master.opt b/mysql-test/t/lock_sync-master.opt
new file mode 100644
index 00000000000..96f0ce3f36c
--- /dev/null
+++ b/mysql-test/t/lock_sync-master.opt
@@ -0,0 +1 @@
+--default-storage-engine=MyISAM