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-08 12:17:55+02:00, hhunger@stripped +6 -0
Also to WL4288.
mysql-test/r/character_set_database_func.result@stripped, 2008-04-08 12:17:49+02:00, hhunger@stripped +2 -2
Also to WL4288.
mysql-test/t/character_set_database_func.test@stripped, 2008-04-08 12:17:49+02:00, hhunger@stripped +2 -2
Also to WL4288.
mysql-test/t/innodb_autoinc_lock_mode_func.test@stripped, 2008-04-08 12:17:49+02:00, hhunger@stripped +1 -1
Also to WL4288.
mysql-test/t/innodb_max_dirty_pages_pct_func.test@stripped, 2008-04-08 12:17:49+02:00, hhunger@stripped +1 -0
Also to WL4288.
mysql-test/t/innodb_support_xa_func.test@stripped, 2008-04-08 12:17:49+02:00, hhunger@stripped +1 -0
Also to WL4288.
mysql-test/t/innodb_table_locks_func.test@stripped, 2008-04-08 12:17:49+02:00, hhunger@stripped +1 -0
Also to WL4288.
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-07 15:14:05 +02:00
+++ b/mysql-test/r/character_set_database_func.result 2008-04-08 12:17:49 +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 'MYSQL_TEST_DIR/std_data/charset_utf8.txt' INTO TABLE t1;
+LOAD DATA INFILE '../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 'MYSQL_TEST_DIR/std_data/charset_utf8.txt' INTO TABLE t1;
+LOAD DATA INFILE '../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-07 15:13:40 +02:00
+++ b/mysql-test/t/character_set_database_func.test 2008-04-08 12:17:49 +02:00
@@ -90,14 +90,14 @@ 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 '$MYSQL_TEST_DIR/std_data/charset_utf8.txt' INTO TABLE t1;
+eval LOAD DATA INFILE '../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 '$MYSQL_TEST_DIR/std_data/charset_utf8.txt' INTO TABLE t1;
+eval LOAD DATA INFILE '../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/innodb_autoinc_lock_mode_func.test b/mysql-test/t/innodb_autoinc_lock_mode_func.test
--- a/mysql-test/t/innodb_autoinc_lock_mode_func.test 2008-04-07 15:13:46 +02:00
+++ b/mysql-test/t/innodb_autoinc_lock_mode_func.test 2008-04-08 12:17:49 +02:00
@@ -23,7 +23,7 @@
################################################################
# Begin the functionality Testing of innodb_autoinc_lock_mode #
################################################################
-
+--source include/have_innodb.inc
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET global innodb_autoinc_lock_mode = 1;
diff -Nrup a/mysql-test/t/innodb_max_dirty_pages_pct_func.test b/mysql-test/t/innodb_max_dirty_pages_pct_func.test
--- a/mysql-test/t/innodb_max_dirty_pages_pct_func.test 2008-04-07 15:13:48 +02:00
+++ b/mysql-test/t/innodb_max_dirty_pages_pct_func.test 2008-04-08 12:17:49 +02:00
@@ -19,6 +19,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--echo '#--------------------FN_DYNVARS_044_02-------------------------#'
###########################################################################
# Check if setting innodb_max_dirty_pages_pct is changed in new connection#
diff -Nrup a/mysql-test/t/innodb_support_xa_func.test b/mysql-test/t/innodb_support_xa_func.test
--- a/mysql-test/t/innodb_support_xa_func.test 2008-04-07 15:13:49 +02:00
+++ b/mysql-test/t/innodb_support_xa_func.test 2008-04-08 12:17:49 +02:00
@@ -19,6 +19,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--echo '#--------------------FN_DYNVARS_046_01-------------------------#'
####################################################################
# Check if setting innodb_support_xa is changed in new connection #
diff -Nrup a/mysql-test/t/innodb_table_locks_func.test b/mysql-test/t/innodb_table_locks_func.test
--- a/mysql-test/t/innodb_table_locks_func.test 2008-04-07 15:13:49 +02:00
+++ b/mysql-test/t/innodb_table_locks_func.test 2008-04-08 12:17:49 +02:00
@@ -19,6 +19,7 @@
# #
###############################################################################
+--source include/have_innodb.inc
--echo '#--------------------FN_DYNVARS_048_01-------------------------#'
####################################################################
# Check if setting innodb_table_locks is changed in new connection #
| Thread |
|---|
| • bk commit into 5.1 tree (hhunger:1.2586) | horst | 8 Apr |
