#At file:///work/bzr/5.1-clean/
2677 Horst Hunger 2008-07-25
2. fix for bug#38349 for 5.1 after having the results with the new mtr.
modified:
mysql-test/r/delay_key_write_func.result
mysql-test/r/general_log_file_basic.result
mysql-test/r/log_output_func.result
mysql-test/r/rpl_init_slave_func.result
mysql-test/r/slow_query_log_file_basic.result
mysql-test/t/delay_key_write_func.test
mysql-test/t/general_log_file_basic.test
mysql-test/t/log_output_func.test
mysql-test/t/rpl_init_slave_func.test
mysql-test/t/slow_query_log_file_basic.test
=== modified file 'mysql-test/r/delay_key_write_func.result'
--- a/mysql-test/r/delay_key_write_func.result 2008-07-25 14:00:28 +0000
+++ b/mysql-test/r/delay_key_write_func.result 2008-07-25 17:10:55 +0000
@@ -69,6 +69,7 @@ count(*)
9
DROP PROCEDURE sp_addRecords;
DROP TABLE t1;
+SET @@global.delay_key_write= @start_value;
SELECT @@global.delay_key_write;
@@global.delay_key_write
-ALL
+ON
=== modified file 'mysql-test/r/general_log_file_basic.result'
--- a/mysql-test/r/general_log_file_basic.result 2008-07-25 14:00:28 +0000
+++ b/mysql-test/r/general_log_file_basic.result 2008-07-25 17:10:55 +0000
@@ -1,7 +1,4 @@
SET @start_value = @@global.general_log_file;
-SELECT @start_value;
-@start_value
-test.log
'#---------------------FN_DYNVARS_004_01-------------------------#'
SET @@global.general_log_file = DEFAULT;
SELECT RIGHT(@@global.general_log_file,10) AS log_file;
@@ -18,6 +15,3 @@ WHERE VARIABLE_NAME='general_log_file';
@@global.general_log_file = VARIABLE_VALUE
1
SET @@global.general_log_file= @start_value;
-SELECT @@global.general_log_file;
-@@global.general_log_file
-/work/bzr/5.1-clean/mysql-test/var/run/master.log
=== modified file 'mysql-test/r/log_output_func.result'
--- a/mysql-test/r/log_output_func.result 2008-07-25 14:00:28 +0000
+++ b/mysql-test/r/log_output_func.result 2008-07-25 17:10:55 +0000
@@ -55,6 +55,4 @@ SELECT count(*) from mysql.general_log;
count(*)
0
DROP TABLE t1;
-SELECT @@global.log_output;
-@@global.log_output
-FILE
+SET @@global.log_output= @start_value;
=== modified file 'mysql-test/r/rpl_init_slave_func.result'
--- a/mysql-test/r/rpl_init_slave_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/rpl_init_slave_func.result 2008-07-25 17:10:55 +0000
@@ -5,6 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
'#--------------------FN_DYNVARS_037_01-------------------------#'
+SET @start_value= @@global.init_slave;
SET @@global.init_slave = "SET @a = 10";
'connect (con1,localhost,root,,)'
'connection con1'
@@ -45,3 +46,4 @@ SELECT @a;
NULL
'Bug#35365 SET statement in init_slave not execute if slave is restarted'
set global max_connections= default;
+SET @@global.init_slave= @start_value;
=== modified file 'mysql-test/r/slow_query_log_file_basic.result'
--- a/mysql-test/r/slow_query_log_file_basic.result 2008-07-25 14:00:28 +0000
+++ b/mysql-test/r/slow_query_log_file_basic.result 2008-07-25 17:10:55 +0000
@@ -1,7 +1,4 @@
SET @start_value = @@global.slow_query_log_file;
-SELECT @start_value;
-@start_value
-slowtest.log
'#---------------------FN_DYNVARS_004_01-------------------------#'
SET @@global.slow_query_log_file = DEFAULT;
SELECT RIGHT(@@global.slow_query_log_file,15);
@@ -18,6 +15,3 @@ WHERE VARIABLE_NAME='slow_query_log_file
@@global.slow_query_log_file = VARIABLE_VALUE
1
SET @@global.slow_query_log_file= @start_value;
-SELECT @@global.slow_query_log_file;
-@@global.slow_query_log_file
-/work/bzr/5.1-clean/mysql-test/var/run/master-slow.log
=== modified file 'mysql-test/t/delay_key_write_func.test'
--- a/mysql-test/t/delay_key_write_func.test 2008-07-25 14:00:28 +0000
+++ b/mysql-test/t/delay_key_write_func.test 2008-07-25 17:10:55 +0000
@@ -145,7 +145,10 @@ select count(*) from t1;
DROP PROCEDURE sp_addRecords;
DROP TABLE t1;
+disconnect user1;
+connection default;
+SET @@global.delay_key_write= @start_value;
SELECT @@global.delay_key_write;
####################################################
=== modified file 'mysql-test/t/general_log_file_basic.test'
--- a/mysql-test/t/general_log_file_basic.test 2008-07-25 14:00:28 +0000
+++ b/mysql-test/t/general_log_file_basic.test 2008-07-25 17:10:55 +0000
@@ -35,8 +35,6 @@
########################################################################
SET @start_value = @@global.general_log_file;
-SELECT @start_value;
-
--echo '#---------------------FN_DYNVARS_004_01-------------------------#'
###############################################
@@ -68,7 +66,6 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='general_log_file';
SET @@global.general_log_file= @start_value;
-SELECT @@global.general_log_file;
#####################################################
# END OF general_log_file TESTS #
=== modified file 'mysql-test/t/log_output_func.test'
--- a/mysql-test/t/log_output_func.test 2008-07-25 14:00:28 +0000
+++ b/mysql-test/t/log_output_func.test 2008-07-25 17:10:55 +0000
@@ -109,7 +109,10 @@ SELECT count(*) from mysql.general_log;
DROP TABLE t1;
-SELECT @@global.log_output;
+disconnect con1;
+
+connection default;
+SET @@global.log_output= @start_value;
--enable_ps_protocol
####################################################
=== modified file 'mysql-test/t/rpl_init_slave_func.test'
--- a/mysql-test/t/rpl_init_slave_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/rpl_init_slave_func.test 2008-07-25 17:10:55 +0000
@@ -26,6 +26,8 @@ source include/master-slave.inc;
# Check if setting init_slave is changed in every new connection #
##################################################################
+SET @start_value= @@global.init_slave;
+
SET @@global.init_slave = "SET @a = 10";
--echo 'connect (con1,localhost,root,,)'
@@ -90,6 +92,10 @@ SELECT @a;
# Restore value
set global max_connections= default;
+connection default;
+
+SET @@global.init_slave= @start_value;
+
##################################################
# End of functionality Testing for init_slave #
##################################################
=== modified file 'mysql-test/t/slow_query_log_file_basic.test'
--- a/mysql-test/t/slow_query_log_file_basic.test 2008-07-25 14:00:28 +0000
+++ b/mysql-test/t/slow_query_log_file_basic.test 2008-07-25 17:10:55 +0000
@@ -35,8 +35,6 @@
###########################################################################
SET @start_value = @@global.slow_query_log_file;
-SELECT @start_value;
-
--echo '#---------------------FN_DYNVARS_004_01-------------------------#'
###############################################
@@ -67,7 +65,6 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='slow_query_log_file';
SET @@global.slow_query_log_file= @start_value;
-SELECT @@global.slow_query_log_file;
#####################################################
# END OF slow_query_log_file TESTS #
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (horst:2677) Bug#38349 | Horst Hunger | 25 Jul |
