Second set of fixes for bug#35988.

38 files changed, 66 insertions, 10 deletions

diff --git a/mysql-test/r/character_set_database_func.result b/mysql-test/r/character_set_database_func.result
index 69e718addf3..95b65eacfd2 100644
--- a/mysql-test/r/character_set_database_func.result
+++ b/mysql-test/r/character_set_database_func.result
@@ -59,14 +59,14 @@ USE test;
 CREATE TABLE t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8;
 'Verify with latin';
 SET @@session.character_set_database = latin1;
-LOAD DATA INFILE '../std_data_ln/charset_utf8.txt' INTO TABLE t1;
+LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
 SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1;
 count(*)
 2433
 TRUNCATE TABLE t1;
 'Verify with utf8';
 SET @@session.character_set_database = utf8;
-LOAD DATA INFILE '../std_data_ln/charset_utf8.txt' INTO TABLE t1;
+LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
 SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1;
 count(*)
 1
diff --git a/mysql-test/t/character_set_database_func.test b/mysql-test/t/character_set_database_func.test
index b09853955f2..2b17f4cf99e 100644
--- a/mysql-test/t/character_set_database_func.test
+++ b/mysql-test/t/character_set_database_func.test
@@ -89,15 +89,15 @@ CREATE TABLE t1 (a CHAR(4) CHARACTER SET utf8) ENGINE=MyISAM CHARACTER SET utf8;
 
 --echo 'Verify with latin';
 SET @@session.character_set_database = latin1;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '../std_data_ln/charset_utf8.txt' INTO TABLE t1;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
 SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1;
 TRUNCATE TABLE t1;
 
 --echo 'Verify with utf8';
 SET @@session.character_set_database = utf8;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '../std_data_ln/charset_utf8.txt' INTO TABLE t1;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
 SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1;
 
 --disable_warnings
diff --git a/mysql-test/t/completion_type_func.test b/mysql-test/t/completion_type_func.test
index 34521744559..71d66dac777 100644
--- a/mysql-test/t/completion_type_func.test
+++ b/mysql-test/t/completion_type_func.test
@@ -99,6 +99,6 @@ INSERT into t1(name) values('Record_8');
 INSERT into t1(name) values('Record_9');
 ROLLBACK;
 
---Error 2006,2013
+--Error 2006,2013,1053
 INSERT into t1(name) values('Record_4');
 
diff --git a/mysql-test/t/general_log_func.test b/mysql-test/t/general_log_func.test
index 715e14501db..39ce964a105 100644
--- a/mysql-test/t/general_log_func.test
+++ b/mysql-test/t/general_log_func.test
@@ -54,7 +54,8 @@ INSERT into t1(name) values('Record_1');
 INSERT into t1(name) values('Record_2');
 
 --echo ## There should be no difference, case should pass ##
---diff_files var/log/master.log var/log/master-test.log
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--diff_files $MYSQLTEST_VARDIR/log/master.log $MYSQLTEST_VARDIR/log/master-test.log
 
 
 --echo '#--------------------FN_DYNVARS_018_01-------------------------#'
diff --git a/mysql-test/t/identity_func.test b/mysql-test/t/identity_func.test
index 2920b3f4c0b..ff93607a2cd 100644
--- a/mysql-test/t/identity_func.test
+++ b/mysql-test/t/identity_func.test
@@ -19,6 +19,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/t/innodb_additional_mem_pool_size_basic.test b/mysql-test/t/innodb_additional_mem_pool_size_basic.test
index 5082867a16f..ffb1046ed32 100644
--- a/mysql-test/t/innodb_additional_mem_pool_size_basic.test
+++ b/mysql-test/t/innodb_additional_mem_pool_size_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_020_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_autoextend_increment_basic.test b/mysql-test/t/innodb_autoextend_increment_basic.test
index e833189f1d2..86f8c7aa7a4 100644
--- a/mysql-test/t/innodb_autoextend_increment_basic.test
+++ b/mysql-test/t/innodb_autoextend_increment_basic.test
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/innodb_autoinc_lock_mode_basic.test b/mysql-test/t/innodb_autoinc_lock_mode_basic.test
index 32398bf5fe3..5b6fa943bbe 100644
--- a/mysql-test/t/innodb_autoinc_lock_mode_basic.test
+++ b/mysql-test/t/innodb_autoinc_lock_mode_basic.test
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/innodb_buffer_pool_size_basic.test b/mysql-test/t/innodb_buffer_pool_size_basic.test
index 7de4b9f853c..190b2d19bc4 100644
--- a/mysql-test/t/innodb_buffer_pool_size_basic.test
+++ b/mysql-test/t/innodb_buffer_pool_size_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_022_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_checksums_basic.test b/mysql-test/t/innodb_checksums_basic.test
index 7b738557789..89daad9ce0a 100644
--- a/mysql-test/t/innodb_checksums_basic.test
+++ b/mysql-test/t/innodb_checksums_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_023_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_commit_concurrency_basic.test b/mysql-test/t/innodb_commit_concurrency_basic.test
index c746660ecfb..1ef69e34999 100644
--- a/mysql-test/t/innodb_commit_concurrency_basic.test
+++ b/mysql-test/t/innodb_commit_concurrency_basic.test
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/innodb_data_file_path_basic.test b/mysql-test/t/innodb_data_file_path_basic.test
index 5c1c2b06f44..1d88c47b1bb 100644
--- a/mysql-test/t/innodb_data_file_path_basic.test
+++ b/mysql-test/t/innodb_data_file_path_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_024_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_data_home_dir_basic.test b/mysql-test/t/innodb_data_home_dir_basic.test
index 1922f5e883c..f3b02edf83b 100644
--- a/mysql-test/t/innodb_data_home_dir_basic.test
+++ b/mysql-test/t/innodb_data_home_dir_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_025_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_doublewrite_basic.test b/mysql-test/t/innodb_doublewrite_basic.test
index a4cc53d59fc..4a0460bb4bc 100644
--- a/mysql-test/t/innodb_doublewrite_basic.test
+++ b/mysql-test/t/innodb_doublewrite_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_026_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_fast_shutdown_basic.test b/mysql-test/t/innodb_fast_shutdown_basic.test
index bda2bec59d4..5e108708716 100644
--- a/mysql-test/t/innodb_fast_shutdown_basic.test
+++ b/mysql-test/t/innodb_fast_shutdown_basic.test
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/innodb_file_io_threads_basic.test b/mysql-test/t/innodb_file_io_threads_basic.test
index c7ce91d0f70..8e09c75ded6 100644
--- a/mysql-test/t/innodb_file_io_threads_basic.test
+++ b/mysql-test/t/innodb_file_io_threads_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_027_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_file_per_table_basic.test b/mysql-test/t/innodb_file_per_table_basic.test
index 0a865d11345..bc0e34c484e 100644
--- a/mysql-test/t/innodb_file_per_table_basic.test
+++ b/mysql-test/t/innodb_file_per_table_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_028_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test
index b56a6b6fe04..90da929d199 100644
--- a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test
+++ b/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test
@@ -24,6 +24,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/innodb_flush_method_basic.test b/mysql-test/t/innodb_flush_method_basic.test
index bb21b23f166..531df4a2464 100644
--- a/mysql-test/t/innodb_flush_method_basic.test
+++ b/mysql-test/t/innodb_flush_method_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_029_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_force_recovery_basic.test b/mysql-test/t/innodb_force_recovery_basic.test
index 7986a336a72..f5aa769f09f 100644
--- a/mysql-test/t/innodb_force_recovery_basic.test
+++ b/mysql-test/t/innodb_force_recovery_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_030_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_lock_wait_timeout_basic.test b/mysql-test/t/innodb_lock_wait_timeout_basic.test
index 22d1da10312..ed31fc9eb6b 100644
--- a/mysql-test/t/innodb_lock_wait_timeout_basic.test
+++ b/mysql-test/t/innodb_lock_wait_timeout_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_032_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test b/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
index da2584d84a0..63835113770 100644
--- a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
+++ b/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_031_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_log_buffer_size_basic.test b/mysql-test/t/innodb_log_buffer_size_basic.test
index c97f439dbc9..74c1aeab87a 100644
--- a/mysql-test/t/innodb_log_buffer_size_basic.test
+++ b/mysql-test/t/innodb_log_buffer_size_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_033_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_log_file_size_basic.test b/mysql-test/t/innodb_log_file_size_basic.test
index dc6e3d21a28..08925b73957 100644
--- a/mysql-test/t/innodb_log_file_size_basic.test
+++ b/mysql-test/t/innodb_log_file_size_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_035_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_log_files_in_group_basic.test b/mysql-test/t/innodb_log_files_in_group_basic.test
index 714278f6e28..67978efe76a 100644
--- a/mysql-test/t/innodb_log_files_in_group_basic.test
+++ b/mysql-test/t/innodb_log_files_in_group_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_034_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_log_group_home_dir_basic.test b/mysql-test/t/innodb_log_group_home_dir_basic.test
index 0dadbd0940b..7e3969c6bd7 100644
--- a/mysql-test/t/innodb_log_group_home_dir_basic.test
+++ b/mysql-test/t/innodb_log_group_home_dir_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_036_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test b/mysql-test/t/innodb_max_dirty_pages_pct_basic.test
index 8257c2ff89f..830617866ca 100644
--- a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test
+++ b/mysql-test/t/innodb_max_dirty_pages_pct_basic.test
@@ -23,7 +23,7 @@
 #  server-system-variables.html                                               #
 #                                                                             #
 ###############################################################################
-
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################
diff --git a/mysql-test/t/innodb_mirrored_log_groups_basic.test b/mysql-test/t/innodb_mirrored_log_groups_basic.test
index fb7ffb8544b..6edb07ac39f 100644
--- a/mysql-test/t/innodb_mirrored_log_groups_basic.test
+++ b/mysql-test/t/innodb_mirrored_log_groups_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_037_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_open_files_basic.test b/mysql-test/t/innodb_open_files_basic.test
index 34dcb8f3980..c55b7e55937 100644
--- a/mysql-test/t/innodb_open_files_basic.test
+++ b/mysql-test/t/innodb_open_files_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_038_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_rollback_on_timeout_basic.test b/mysql-test/t/innodb_rollback_on_timeout_basic.test
index 3dff6acdc0f..c33e0fa1b75 100644
--- a/mysql-test/t/innodb_rollback_on_timeout_basic.test
+++ b/mysql-test/t/innodb_rollback_on_timeout_basic.test
@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --echo '#---------------------BS_STVARS_039_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
diff --git a/mysql-test/t/innodb_support_xa_basic.test b/mysql-test/t/innodb_support_xa_basic.test
index 3e14ab18c30..6da3e68ebdf 100644
--- a/mysql-test/t/innodb_support_xa_basic.test
+++ b/mysql-test/t/innodb_support_xa_basic.test
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/innodb_table_locks_basic.test b/mysql-test/t/innodb_table_locks_basic.test
index 0aadd0a3f4e..35961c43a7f 100644
--- a/mysql-test/t/innodb_table_locks_basic.test
+++ b/mysql-test/t/innodb_table_locks_basic.test
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/innodb_thread_concurrency_basic.test b/mysql-test/t/innodb_thread_concurrency_basic.test
index 9f44c7fd4dc..40ce09ce4db 100644
--- a/mysql-test/t/innodb_thread_concurrency_basic.test
+++ b/mysql-test/t/innodb_thread_concurrency_basic.test
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################## 
diff --git a/mysql-test/t/last_insert_id_func.test b/mysql-test/t/last_insert_id_func.test
index 993adce46de..2309c539bd9 100644
--- a/mysql-test/t/last_insert_id_func.test
+++ b/mysql-test/t/last_insert_id_func.test
@@ -19,6 +19,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
diff --git a/mysql-test/t/local_infile_func.test b/mysql-test/t/local_infile_func.test
index f79efffbf95..d0a5a45e9c6 100644
--- a/mysql-test/t/local_infile_func.test
+++ b/mysql-test/t/local_infile_func.test
@@ -19,6 +19,8 @@
 #                                                                              #
 ################################################################################
 
+--source include/not_embedded.inc
+
 --echo '#--------------------FN_DYNVARS_037_01-------------------------#'
 ####################################################################
 # Check if setting local_infile is changed in every new connection #
diff --git a/mysql-test/t/rpl_max_binlog_size_func.test b/mysql-test/t/rpl_max_binlog_size_func.test
index 224d12193a8..df22b253009 100644
--- a/mysql-test/t/rpl_max_binlog_size_func.test
+++ b/mysql-test/t/rpl_max_binlog_size_func.test
@@ -27,7 +27,8 @@ dec $a;
 --sleep 2
 
 # if log file is not created then this will fail
---file_exists var/master-data/mylog.000002
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--file_exists $MYSQLTEST_VARDIR/master-data/mylog.000002
 
 --echo 'mylog.000002 exists'
 
diff --git a/mysql-test/t/storage_engine_basic.test b/mysql-test/t/storage_engine_basic.test
index 129b7d8b406..689afcd1010 100644
--- a/mysql-test/t/storage_engine_basic.test
+++ b/mysql-test/t/storage_engine_basic.test
@@ -15,6 +15,7 @@
 #                                                                      #
 ########################################################################
 
+--source include/have_innodb.inc
 --source include/load_sysvars.inc
 
 ######################################################################
diff --git a/mysql-test/t/tx_isolation_func.test b/mysql-test/t/tx_isolation_func.test
index 24240b6c275..3a4167dc368 100644
--- a/mysql-test/t/tx_isolation_func.test
+++ b/mysql-test/t/tx_isolation_func.test
@@ -19,6 +19,8 @@
 #                                                                                       #
 #########################################################################################
 
+--source include/have_innodb.inc
+
 --echo ** Setup **
 #
 # Setup