Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-05-29 15:40:54+02:00, msvensson@pilot.(none) +15 -0
Fix paths and name of log files
Restore changed settings to the value they had when server was started
mysql-test/r/character_set_database_func.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +2 -2
Fix paths
mysql-test/r/general_log_file_basic.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +1 -1
Fix name of server log file
mysql-test/r/local_infile_func.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +2 -2
Fix paths
mysql-test/r/rpl_max_binlog_size_func.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +3 -0
Restore the value of max_binlog_size before test ends
Drop table t1 before test ends
mysql-test/r/slave_net_timeout_basic.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +2 -2
Update result file to the actual slave_net_timeout value we now use. Same on all
mysqld's since they can both be slave in case of circular replication
mysql-test/r/slow_query_log_file_basic.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +1 -1
Update name of mysqld's log file
mysql-test/r/slow_query_log_file_func.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +1 -1
Fix paths
mysql-test/suite/rpl/r/rpl_sp.result@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +1 -1
Update rsult file to new version of mysqlbinlog
mysql-test/suite/rpl/t/rpl_sp.test@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +2 -1
Fix paths
mysql-test/t/character_set_database_func.test@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +2 -2
Fix paths
mysql-test/t/general_log_file_func.test@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +3 -2
Fix paths
mysql-test/t/local_infile_func.test@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +2 -2
Fix paths
mysql-test/t/repair.test@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +4 -3
Fix paths
mysql-test/t/rpl_max_binlog_size_func.test@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +8 -2
Restore the value of max_binlog_size before test ends
Drop table t1 before test ends
Fix paths
mysql-test/t/slow_query_log_file_func.test@stripped, 2008-05-29 15:40:52+02:00, msvensson@pilot.(none) +4 -3
Fix paths
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-14 17:21:08 +02:00
+++ b/mysql-test/r/character_set_database_func.result 2008-05-29 15:40:52 +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 'MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
+LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/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 'MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
+LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/charset_utf8.txt' INTO TABLE t1;
SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1;
count(*)
1
diff -Nrup a/mysql-test/r/general_log_file_basic.result b/mysql-test/r/general_log_file_basic.result
--- a/mysql-test/r/general_log_file_basic.result 2008-05-20 20:23:55 +02:00
+++ b/mysql-test/r/general_log_file_basic.result 2008-05-29 15:40:52 +02:00
@@ -6,7 +6,7 @@ test.log
SET @@global.general_log_file = DEFAULT;
SELECT RIGHT(@@global.general_log_file,10) AS log_file;
log_file
-master.log
+mysqld.log
'#--------------------FN_DYNVARS_004_02------------------------#'
SET @@global.general_log_file = mytest.log;
SET @@global.general_log_file = 12;
diff -Nrup a/mysql-test/r/local_infile_func.result b/mysql-test/r/local_infile_func.result
--- a/mysql-test/r/local_infile_func.result 2008-04-15 15:44:08 +02:00
+++ b/mysql-test/r/local_infile_func.result 2008-05-29 15:40:52 +02:00
@@ -18,7 +18,7 @@ SET @@global.local_infile = 1;
DROP TABLE IF EXISTS t1;
create table t1(a int);
LOAD DATA LOCAL INFILE
-'MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1;
+'MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1;
SELECT count(*) from t1;
count(*)
9
@@ -27,7 +27,7 @@ SET @@global.local_infile = 0;
DROP TABLE IF EXISTS t1;
create table t1(a int);
LOAD DATA LOCAL INFILE
-'MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1;
+'MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1;
ERROR 42000: The used command is not allowed with this MySQL version
SELECT count(*) from t1;
count(*)
diff -Nrup a/mysql-test/r/rpl_max_binlog_size_func.result b/mysql-test/r/rpl_max_binlog_size_func.result
--- a/mysql-test/r/rpl_max_binlog_size_func.result 2008-04-10 15:13:40 +02:00
+++ b/mysql-test/r/rpl_max_binlog_size_func.result 2008-05-29 15:40:52 +02:00
@@ -1,5 +1,8 @@
DROP TABLE IF EXISTS t1;
'--- check if log file is rotated after 4096 bytes ----'
+SET @saved_max_binlog_size= @@global.max_binlog_size;
SET @@global.max_binlog_size = 4096;
CREATE TABLE t1(a CHAR(5));
'mylog.000002 exists'
+SET @@global.max_binlog_size= @saved_max_binlog_size;
+DROP TABLE t1;
diff -Nrup a/mysql-test/r/slave_net_timeout_basic.result b/mysql-test/r/slave_net_timeout_basic.result
--- a/mysql-test/r/slave_net_timeout_basic.result 2008-04-10 15:13:40 +02:00
+++ b/mysql-test/r/slave_net_timeout_basic.result 2008-05-29 15:40:52 +02:00
@@ -1,7 +1,7 @@
SET @start_global_value = @@global.slave_net_timeout;
SELECT @start_global_value;
@start_global_value
-3600
+120
'#--------------------FN_DYNVARS_146_01-------------------------#'
SET @@global.slave_net_timeout = 500000;
SET @@global.slave_net_timeout = DEFAULT;
@@ -124,4 +124,4 @@ SET global slave_net_timeout = 99;
SET @@global.slave_net_timeout = @start_global_value;
SELECT @@global.slave_net_timeout;
@@global.slave_net_timeout
-3600
+120
diff -Nrup a/mysql-test/r/slow_query_log_file_basic.result b/mysql-test/r/slow_query_log_file_basic.result
--- a/mysql-test/r/slow_query_log_file_basic.result 2008-05-20 20:23:55 +02:00
+++ b/mysql-test/r/slow_query_log_file_basic.result 2008-05-29 15:40:52 +02:00
@@ -6,7 +6,7 @@ slowtest.log
SET @@global.slow_query_log_file = DEFAULT;
SELECT RIGHT(@@global.slow_query_log_file,15);
RIGHT(@@global.slow_query_log_file,15)
-master-slow.log
+mysqld-slow.log
'#--------------------FN_DYNVARS_004_02------------------------#'
SET @@global.slow_query_log_file = mytest.log;
SET @@global.slow_query_log_file = 12;
diff -Nrup a/mysql-test/r/slow_query_log_file_func.result b/mysql-test/r/slow_query_log_file_func.result
--- a/mysql-test/r/slow_query_log_file_func.result 2008-04-10 15:13:41 +02:00
+++ b/mysql-test/r/slow_query_log_file_func.result 2008-05-29 15:40:52 +02:00
@@ -1,3 +1,3 @@
'#--------------------FN_DYNVARS_018_01-------------------------#'
-## --file_exists var/master-data/my_slow_test.log ##
+## Checking if my_slow_test.log exist in servers datadir ##
## This case should pass because we have set this filename in opt file ##
diff -Nrup a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
--- a/mysql-test/suite/rpl/r/rpl_sp.result 2008-05-16 17:38:11 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_sp.result 2008-05-29 15:40:52 +02:00
@@ -605,7 +605,7 @@ DELIMITER /*!*/;
ROLLBACK/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
SET @@session.sql_mode=0/*!*/;
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
/*!\C latin1 *//*!*/;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_sp.test b/mysql-test/suite/rpl/t/rpl_sp.test
--- a/mysql-test/suite/rpl/t/rpl_sp.test 2008-05-16 17:35:53 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_sp.test 2008-05-29 15:40:52 +02:00
@@ -625,8 +625,9 @@ show function status like '%mysqltestbug
connection master;
flush logs;
+let $MYSQLD_DATADIR= `select @@datadir`;
--replace_regex s/$MYSQL_TEST_DIR/MYSQL_TEST_DIR/ s/TIMESTAMP=[0-9]*/TIMESTAMP=t/
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001
+--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001
use test;
drop procedure mysqltestbug36570_p1;
drop procedure ` mysqltestbug36570_p2`;
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-16 10:23:05 +02:00
+++ b/mysql-test/t/character_set_database_func.test 2008-05-29 15:40:52 +02:00
@@ -92,14 +92,14 @@ CREATE TABLE t1 (a CHAR(4) CHARACTER SET
--echo 'Verify with latin';
SET @@session.character_set_database = latin1;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
+eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data/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 $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/charset_utf8.txt' INTO TABLE t1;
+eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data/charset_utf8.txt' INTO TABLE t1;
SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1;
--disable_warnings
diff -Nrup a/mysql-test/t/general_log_file_func.test b/mysql-test/t/general_log_file_func.test
--- a/mysql-test/t/general_log_file_func.test 2008-04-11 21:59:29 +02:00
+++ b/mysql-test/t/general_log_file_func.test 2008-05-29 15:40:52 +02:00
@@ -50,8 +50,9 @@ INSERT into t1(name) values('Record_3');
INSERT into t1(name) values('Record_4');
--echo ## Verifying general log file ##
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---file_exists $MYSQLTEST_VARDIR/master-data/mysql-test.log
+let $MYSQLD_DATADIR= `select @@datadir`;
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
+--file_exists $MYSQLD_DATADIR/mysql-test.log
--echo ## Dropping table ##
DROP TABLE t1;
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-15 15:44:09 +02:00
+++ b/mysql-test/t/local_infile_func.test 2008-05-29 15:40:52 +02:00
@@ -64,7 +64,7 @@ create table t1(a int);
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
eval LOAD DATA LOCAL INFILE
-'$MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1;
+'$MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1;
SELECT count(*) from t1;
@@ -81,7 +81,7 @@ create table t1(a int);
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--Error ER_NOT_ALLOWED_COMMAND
eval LOAD DATA LOCAL INFILE
-'$MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1;
+'$MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1;
SELECT count(*) from t1;
diff -Nrup a/mysql-test/t/repair.test b/mysql-test/t/repair.test
--- a/mysql-test/t/repair.test 2008-05-29 11:41:03 +02:00
+++ b/mysql-test/t/repair.test 2008-05-29 15:40:52 +02:00
@@ -120,9 +120,10 @@ DROP TABLE t1;
#
--echo # Test with a saved table from 4.1
---copy_file std_data/bug36055.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm
---copy_file std_data/bug36055.MYD $MYSQLTEST_VARDIR/master-data/test/t1.MYD
---copy_file std_data/bug36055.MYI $MYSQLTEST_VARDIR/master-data/test/t1.MYI
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file std_data/bug36055.frm $MYSQLD_DATADIR/test/t1.frm
+--copy_file std_data/bug36055.MYD $MYSQLD_DATADIR/test/t1.MYD
+--copy_file std_data/bug36055.MYI $MYSQLD_DATADIR/test/t1.MYI
--replace_column 12 # 13 #
SHOW TABLE STATUS LIKE 't1';
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-14 17:21:11 +02:00
+++ b/mysql-test/t/rpl_max_binlog_size_func.test 2008-05-29 15:40:52 +02:00
@@ -12,6 +12,7 @@ DROP TABLE IF EXISTS t1;
--echo '--- check if log file is rotated after 4096 bytes ----'
#==============================================================
+SET @saved_max_binlog_size= @@global.max_binlog_size;
SET @@global.max_binlog_size = 4096;
CREATE TABLE t1(a CHAR(5));
@@ -27,10 +28,15 @@ dec $a;
--sleep 2
# if log file is not created then this will fail
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---file_exists $MYSQLTEST_VARDIR/master-data/mylog.000002
+let $MYSQLD_DATADIR=`select @@datadir`;
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
+--file_exists $MYSQLD_DATADIR/mylog.000002
--echo 'mylog.000002 exists'
+
+SET @@global.max_binlog_size= @saved_max_binlog_size;
+
+DROP TABLE t1;
###############################################################################
# End of functionality testing for max_binlog_size #
diff -Nrup a/mysql-test/t/slow_query_log_file_func.test b/mysql-test/t/slow_query_log_file_func.test
--- a/mysql-test/t/slow_query_log_file_func.test 2008-04-11 21:59:30 +02:00
+++ b/mysql-test/t/slow_query_log_file_func.test 2008-05-29 15:40:52 +02:00
@@ -25,8 +25,9 @@
# Verifying log file after setting it in opt file #
####################################################################
---echo ## --file_exists var/master-data/my_slow_test.log ##
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---file_exists $MYSQLTEST_VARDIR/master-data/my_slow_test.log
+let $MYSQLD_DATADIR= `select @@datadir`;
+--echo ## Checking if my_slow_test.log exist in servers datadir ##
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
+--file_exists $MYSQLD_DATADIR/my_slow_test.log
--echo ## This case should pass because we have set this filename in opt file ##
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2640) | msvensson | 29 May |
