Below is the list of changes that have just been committed into a local
5.1 repository of hhunger. When hhunger does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-14 13:11:31+02:00, hhunger@stripped +38 -0
second set of bug fixes for bug#35988.
mysql-test/r/character_set_database_func.result@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +2 -2
second set of bug fixes for bug#35988.
mysql-test/t/character_set_database_func.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +4 -4
second set of bug fixes for bug#35988.
mysql-test/t/completion_type_func.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +1 -1
second set of bug fixes for bug#35988.
mysql-test/t/general_log_func.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +2 -1
second set of bug fixes for bug#35988.
mysql-test/t/identity_func.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_additional_mem_pool_size_basic.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_autoextend_increment_basic.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_autoinc_lock_mode_basic.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_buffer_pool_size_basic.test@stripped, 2008-04-14 13:11:23+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_checksums_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_commit_concurrency_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_data_file_path_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_data_home_dir_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_doublewrite_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_fast_shutdown_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_file_io_threads_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_file_per_table_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_flush_log_at_trx_commit_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_flush_method_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_force_recovery_basic.test@stripped, 2008-04-14 13:11:24+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_lock_wait_timeout_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_log_buffer_size_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_log_file_size_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_log_files_in_group_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_log_group_home_dir_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_max_dirty_pages_pct_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +1 -1
second set of bug fixes for bug#35988.
mysql-test/t/innodb_mirrored_log_groups_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_open_files_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_rollback_on_timeout_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_support_xa_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_table_locks_basic.test@stripped, 2008-04-14 13:11:25+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/innodb_thread_concurrency_basic.test@stripped, 2008-04-14 13:11:26+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/last_insert_id_func.test@stripped, 2008-04-14 13:11:26+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/local_infile_func.test@stripped, 2008-04-14 13:11:26+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
mysql-test/t/rpl_max_binlog_size_func.test@stripped, 2008-04-14 13:11:26+02:00, hhunger@stripped +2 -1
second set of bug fixes for bug#35988.
mysql-test/t/storage_engine_basic.test@stripped, 2008-04-14 13:11:26+02:00, hhunger@stripped +1 -0
second set of bug fixes for bug#35988.
mysql-test/t/tx_isolation_func.test@stripped, 2008-04-14 13:11:26+02:00, hhunger@stripped +2 -0
second set of bug fixes for bug#35988.
diff -Nrup a/mysql-test/r/character_set_database_func.result b/mysql-test/r/character_set_database_func.result
--- a/mysql-test/r/character_set_database_func.result 2008-04-10 15:12:33 +02:00
+++ b/mysql-test/r/character_set_database_func.result 2008-04-14 13:11:23 +02:00
@@ -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 -Nrup a/mysql-test/t/character_set_database_func.test b/mysql-test/t/character_set_database_func.test
--- a/mysql-test/t/character_set_database_func.test 2008-04-10 15:13:48 +02:00
+++ b/mysql-test/t/character_set_database_func.test 2008-04-14 13:11:23 +02:00
@@ -89,15 +89,15 @@ CREATE TABLE t1 (a CHAR(4) CHARACTER SET
--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 -Nrup a/mysql-test/t/completion_type_func.test b/mysql-test/t/completion_type_func.test
--- a/mysql-test/t/completion_type_func.test 2008-04-11 21:59:29 +02:00
+++ b/mysql-test/t/completion_type_func.test 2008-04-14 13:11:23 +02:00
@@ -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 -Nrup a/mysql-test/t/general_log_func.test b/mysql-test/t/general_log_func.test
--- a/mysql-test/t/general_log_func.test 2008-04-11 21:59:29 +02:00
+++ b/mysql-test/t/general_log_func.test 2008-04-14 13:11:23 +02:00
@@ -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 -Nrup a/mysql-test/t/identity_func.test b/mysql-test/t/identity_func.test
--- a/mysql-test/t/identity_func.test 2008-04-10 15:13:54 +02:00
+++ b/mysql-test/t/identity_func.test 2008-04-14 13:11:23 +02:00
@@ -19,6 +19,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--disable_warnings
drop table if exists t1;
diff -Nrup a/mysql-test/t/innodb_additional_mem_pool_size_basic.test b/mysql-test/t/innodb_additional_mem_pool_size_basic.test
--- a/mysql-test/t/innodb_additional_mem_pool_size_basic.test 2008-04-10 15:13:54 +02:00
+++ b/mysql-test/t/innodb_additional_mem_pool_size_basic.test 2008-04-14 13:11:23 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_020_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_autoextend_increment_basic.test b/mysql-test/t/innodb_autoextend_increment_basic.test
--- a/mysql-test/t/innodb_autoextend_increment_basic.test 2008-04-10 15:13:54 +02:00
+++ b/mysql-test/t/innodb_autoextend_increment_basic.test 2008-04-14 13:11:23 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/innodb_autoinc_lock_mode_basic.test b/mysql-test/t/innodb_autoinc_lock_mode_basic.test
--- a/mysql-test/t/innodb_autoinc_lock_mode_basic.test 2008-04-10 15:13:54 +02:00
+++ b/mysql-test/t/innodb_autoinc_lock_mode_basic.test 2008-04-14 13:11:23 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/innodb_buffer_pool_size_basic.test b/mysql-test/t/innodb_buffer_pool_size_basic.test
--- a/mysql-test/t/innodb_buffer_pool_size_basic.test 2008-04-10 15:13:54 +02:00
+++ b/mysql-test/t/innodb_buffer_pool_size_basic.test 2008-04-14 13:11:23 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_022_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_checksums_basic.test b/mysql-test/t/innodb_checksums_basic.test
--- a/mysql-test/t/innodb_checksums_basic.test 2008-04-10 15:13:54 +02:00
+++ b/mysql-test/t/innodb_checksums_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_023_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_commit_concurrency_basic.test b/mysql-test/t/innodb_commit_concurrency_basic.test
--- a/mysql-test/t/innodb_commit_concurrency_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_commit_concurrency_basic.test 2008-04-14 13:11:24 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/innodb_data_file_path_basic.test b/mysql-test/t/innodb_data_file_path_basic.test
--- a/mysql-test/t/innodb_data_file_path_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_data_file_path_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_024_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_data_home_dir_basic.test b/mysql-test/t/innodb_data_home_dir_basic.test
--- a/mysql-test/t/innodb_data_home_dir_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_data_home_dir_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_025_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_doublewrite_basic.test b/mysql-test/t/innodb_doublewrite_basic.test
--- a/mysql-test/t/innodb_doublewrite_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_doublewrite_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_026_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_fast_shutdown_basic.test b/mysql-test/t/innodb_fast_shutdown_basic.test
--- a/mysql-test/t/innodb_fast_shutdown_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_fast_shutdown_basic.test 2008-04-14 13:11:24 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/innodb_file_io_threads_basic.test b/mysql-test/t/innodb_file_io_threads_basic.test
--- a/mysql-test/t/innodb_file_io_threads_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_file_io_threads_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_027_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_file_per_table_basic.test b/mysql-test/t/innodb_file_per_table_basic.test
--- a/mysql-test/t/innodb_file_per_table_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_file_per_table_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_028_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test
--- a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test 2008-04-14 13:11:24 +02:00
@@ -24,6 +24,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/innodb_flush_method_basic.test b/mysql-test/t/innodb_flush_method_basic.test
--- a/mysql-test/t/innodb_flush_method_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_flush_method_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_029_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_force_recovery_basic.test b/mysql-test/t/innodb_force_recovery_basic.test
--- a/mysql-test/t/innodb_force_recovery_basic.test 2008-04-10 15:13:55 +02:00
+++ b/mysql-test/t/innodb_force_recovery_basic.test 2008-04-14 13:11:24 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_030_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_lock_wait_timeout_basic.test b/mysql-test/t/innodb_lock_wait_timeout_basic.test
--- a/mysql-test/t/innodb_lock_wait_timeout_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_lock_wait_timeout_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_032_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test b/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
--- a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_031_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_log_buffer_size_basic.test b/mysql-test/t/innodb_log_buffer_size_basic.test
--- a/mysql-test/t/innodb_log_buffer_size_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_log_buffer_size_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_033_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_log_file_size_basic.test b/mysql-test/t/innodb_log_file_size_basic.test
--- a/mysql-test/t/innodb_log_file_size_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_log_file_size_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_035_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_log_files_in_group_basic.test b/mysql-test/t/innodb_log_files_in_group_basic.test
--- a/mysql-test/t/innodb_log_files_in_group_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_log_files_in_group_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_034_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_log_group_home_dir_basic.test b/mysql-test/t/innodb_log_group_home_dir_basic.test
--- a/mysql-test/t/innodb_log_group_home_dir_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_log_group_home_dir_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_036_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test b/mysql-test/t/innodb_max_dirty_pages_pct_basic.test
--- a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_max_dirty_pages_pct_basic.test 2008-04-14 13:11:25 +02:00
@@ -23,7 +23,7 @@
# server-system-variables.html #
# #
###############################################################################
-
+--source include/have_innodb.inc
--source include/load_sysvars.inc
######################################################################
diff -Nrup a/mysql-test/t/innodb_mirrored_log_groups_basic.test b/mysql-test/t/innodb_mirrored_log_groups_basic.test
--- a/mysql-test/t/innodb_mirrored_log_groups_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_mirrored_log_groups_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_037_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_open_files_basic.test b/mysql-test/t/innodb_open_files_basic.test
--- a/mysql-test/t/innodb_open_files_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_open_files_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_038_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_rollback_on_timeout_basic.test b/mysql-test/t/innodb_rollback_on_timeout_basic.test
--- a/mysql-test/t/innodb_rollback_on_timeout_basic.test 2008-04-10 15:13:56 +02:00
+++ b/mysql-test/t/innodb_rollback_on_timeout_basic.test 2008-04-14 13:11:25 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--echo '#---------------------BS_STVARS_039_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/innodb_support_xa_basic.test b/mysql-test/t/innodb_support_xa_basic.test
--- a/mysql-test/t/innodb_support_xa_basic.test 2008-04-10 15:13:57 +02:00
+++ b/mysql-test/t/innodb_support_xa_basic.test 2008-04-14 13:11:25 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/innodb_table_locks_basic.test b/mysql-test/t/innodb_table_locks_basic.test
--- a/mysql-test/t/innodb_table_locks_basic.test 2008-04-10 15:13:57 +02:00
+++ b/mysql-test/t/innodb_table_locks_basic.test 2008-04-14 13:11:25 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/innodb_thread_concurrency_basic.test b/mysql-test/t/innodb_thread_concurrency_basic.test
--- a/mysql-test/t/innodb_thread_concurrency_basic.test 2008-04-10 15:13:57 +02:00
+++ b/mysql-test/t/innodb_thread_concurrency_basic.test 2008-04-14 13:11:26 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
########################################################################
diff -Nrup a/mysql-test/t/last_insert_id_func.test b/mysql-test/t/last_insert_id_func.test
--- a/mysql-test/t/last_insert_id_func.test 2008-04-10 15:13:58 +02:00
+++ b/mysql-test/t/last_insert_id_func.test 2008-04-14 13:11:26 +02:00
@@ -19,6 +19,8 @@
# #
###############################################################################
+--source include/have_innodb.inc
+
--disable_warnings
drop table if exists t1;
--enable_warnings
diff -Nrup a/mysql-test/t/local_infile_func.test b/mysql-test/t/local_infile_func.test
--- a/mysql-test/t/local_infile_func.test 2008-04-11 21:59:29 +02:00
+++ b/mysql-test/t/local_infile_func.test 2008-04-14 13:11:26 +02:00
@@ -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 -Nrup a/mysql-test/t/rpl_max_binlog_size_func.test b/mysql-test/t/rpl_max_binlog_size_func.test
--- a/mysql-test/t/rpl_max_binlog_size_func.test 2008-04-10 15:14:05 +02:00
+++ b/mysql-test/t/rpl_max_binlog_size_func.test 2008-04-14 13:11:26 +02:00
@@ -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 -Nrup a/mysql-test/t/storage_engine_basic.test b/mysql-test/t/storage_engine_basic.test
--- a/mysql-test/t/storage_engine_basic.test 2008-04-10 15:14:10 +02:00
+++ b/mysql-test/t/storage_engine_basic.test 2008-04-14 13:11:26 +02:00
@@ -15,6 +15,7 @@
# #
########################################################################
+--source include/have_innodb.inc
--source include/load_sysvars.inc
######################################################################
diff -Nrup a/mysql-test/t/tx_isolation_func.test b/mysql-test/t/tx_isolation_func.test
--- a/mysql-test/t/tx_isolation_func.test 2008-04-10 15:14:11 +02:00
+++ b/mysql-test/t/tx_isolation_func.test 2008-04-14 13:11:26 +02:00
@@ -19,6 +19,8 @@
# #
#########################################################################################
+--source include/have_innodb.inc
+
--echo ** Setup **
#
# Setup
| Thread |
|---|
| • bk commit into 5.1 tree (hhunger:1.2578) BUG#35988 | horst | 14 Apr |
