#At file:///work/bzr/5.1-clean/
2676 Horst Hunger 2008-07-25
Fix for bug#38349 (duplicate of bug#36536) for 5.1.
modified:
mysql-test/r/binlog_format_basic.result
mysql-test/r/character_set_connection_func.result
mysql-test/r/completion_type_func.result
mysql-test/r/concurrent_insert_func.result
mysql-test/r/delay_key_write_func.result
mysql-test/r/general_log_file_basic.result
mysql-test/r/innodb_autoextend_increment_basic.result
mysql-test/r/innodb_autoinc_lock_mode_func.result
mysql-test/r/innodb_fast_shutdown_basic.result
mysql-test/r/innodb_max_dirty_pages_pct_func.result
mysql-test/r/innodb_table_locks_func.result
mysql-test/r/interactive_timeout_func.result
mysql-test/r/key_buffer_size_func.result
mysql-test/r/log_basic.result
mysql-test/r/log_bin_trust_function_creators_func.result
mysql-test/r/log_output_func.result
mysql-test/r/log_queries_not_using_indexes_basic.result
mysql-test/r/max_allowed_packet_func.result
mysql-test/r/max_seeks_for_key_func.result
mysql-test/r/max_sort_length_func.result
mysql-test/r/myisam_stats_method_func.result
mysql-test/r/query_cache_limit_func.result
mysql-test/r/query_cache_type_func.result
mysql-test/r/query_prealloc_size_func.result
mysql-test/r/rpl_max_binlog_size_func.result
mysql-test/r/slow_query_log_file_basic.result
mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
mysql-test/t/binlog_format_basic.test
mysql-test/t/character_set_connection_func.test
mysql-test/t/completion_type_func.test
mysql-test/t/concurrent_insert_func.test
mysql-test/t/delay_key_write_func.test
mysql-test/t/general_log_file_basic.test
mysql-test/t/innodb_autoextend_increment_basic.test
mysql-test/t/innodb_autoinc_lock_mode_func.test
mysql-test/t/innodb_fast_shutdown_basic.test
mysql-test/t/innodb_max_dirty_pages_pct_func.test
mysql-test/t/innodb_table_locks_func.test
mysql-test/t/interactive_timeout_func.test
mysql-test/t/key_buffer_size_func.test
mysql-test/t/log_basic.test
mysql-test/t/log_bin_trust_function_creators_func.test
mysql-test/t/log_output_func.test
mysql-test/t/log_queries_not_using_indexes_basic.test
mysql-test/t/max_allowed_packet_func.test
mysql-test/t/max_seeks_for_key_func.test
mysql-test/t/max_sort_length_func.test
mysql-test/t/myisam_stats_method_func.test
mysql-test/t/query_cache_limit_func.test
mysql-test/t/query_cache_type_func.test
mysql-test/t/query_prealloc_size_func.test
mysql-test/t/rpl_max_binlog_size_func.test
mysql-test/t/slow_query_log_file_basic.test
=== modified file 'mysql-test/r/binlog_format_basic.result'
--- a/mysql-test/r/binlog_format_basic.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/binlog_format_basic.result 2008-07-25 14:00:28 +0000
@@ -1,4 +1,8 @@
'#---------------------BS_STVARS_002_01----------------------#'
+SET @start_value= @@global.binlog_format;
+SELECT @start_value;
+@start_value
+MIXED
SELECT COUNT(@@GLOBAL.binlog_format);
COUNT(@@GLOBAL.binlog_format)
1
@@ -73,3 +77,7 @@ SELECT COUNT(@@GLOBAL.binlog_format);
COUNT(@@GLOBAL.binlog_format)
1
1 Expected
+SET @@global.binlog_format= @start_value;
+SELECT @@global.binlog_format;
+@@global.binlog_format
+MIXED
=== modified file 'mysql-test/r/character_set_connection_func.result'
--- a/mysql-test/r/character_set_connection_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/character_set_connection_func.result 2008-07-25 14:00:28 +0000
@@ -53,3 +53,4 @@ SET @@global.character_set_connection =
SET @@session.character_set_connection = @session_character_set_connection;
SET @@session.character_set_client = @session_character_set_client;
SET @@session.character_set_results = @session_character_set_results;
+DROP TABLE t1;
=== modified file 'mysql-test/r/completion_type_func.result'
--- a/mysql-test/r/completion_type_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/completion_type_func.result 2008-07-25 14:00:28 +0000
@@ -74,3 +74,4 @@ INSERT into t1(name) values('Record_9');
ROLLBACK;
INSERT into t1(name) values('Record_4');
Got one of the listed errors
+DROP TABLE t1;
=== modified file 'mysql-test/r/concurrent_insert_func.result'
--- a/mysql-test/r/concurrent_insert_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/concurrent_insert_func.result 2008-07-25 14:00:28 +0000
@@ -5,6 +5,10 @@ CREATE TABLE t1
name varchar(30)
);
'#--------------------FN_DYNVARS_018_01-------------------------#'
+SET @start_value= @@global.concurrent_insert;
+SELECT @start_value;
+@start_value
+1
## Setting initial value of variable to 1 ##
SET @@global.concurrent_insert = 1;
INSERT into t1(name) values('Record_1');
@@ -71,3 +75,4 @@ Record_5
## Dropping table ##
DROP table t1;
## Disconnecting connection ##
+SET @@global.concurrent_insert= @start_value;
=== modified file 'mysql-test/r/delay_key_write_func.result'
--- a/mysql-test/r/delay_key_write_func.result 2008-04-15 13:44:11 +0000
+++ b/mysql-test/r/delay_key_write_func.result 2008-07-25 14:00:28 +0000
@@ -1,4 +1,8 @@
'#--------------------FN_DYNVARS_023_01-------------------------#'
+SET @start_value= @@global.delay_key_write;
+SELECT @start_value;
+@start_value
+ON
SET @@global.delay_key_write = ON;
SELECT @@global.delay_key_write;
@@global.delay_key_write
@@ -65,3 +69,6 @@ count(*)
9
DROP PROCEDURE sp_addRecords;
DROP TABLE t1;
+SELECT @@global.delay_key_write;
+@@global.delay_key_write
+ALL
=== modified file 'mysql-test/r/general_log_file_basic.result'
--- a/mysql-test/r/general_log_file_basic.result 2008-05-20 18:23:58 +0000
+++ b/mysql-test/r/general_log_file_basic.result 2008-07-25 14:00:28 +0000
@@ -17,3 +17,7 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
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/innodb_autoextend_increment_basic.result'
--- a/mysql-test/r/innodb_autoextend_increment_basic.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/innodb_autoextend_increment_basic.result 2008-07-25 14:00:28 +0000
@@ -92,3 +92,7 @@ Warning 1292 Truncated incorrect autoext
SELECT @@global.innodb_autoextend_increment ;
@@global.innodb_autoextend_increment
1
+SET @@global.innodb_autoextend_increment = @global_start_value;
+SELECT @@global.innodb_autoextend_increment ;
+@@global.innodb_autoextend_increment
+8
=== modified file 'mysql-test/r/innodb_autoinc_lock_mode_func.result'
--- a/mysql-test/r/innodb_autoinc_lock_mode_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/innodb_autoinc_lock_mode_func.result 2008-07-25 14:00:28 +0000
@@ -20,3 +20,4 @@ a b
100 b
101 d
104 e
+DROP TABLE t1;
=== modified file 'mysql-test/r/innodb_fast_shutdown_basic.result'
--- a/mysql-test/r/innodb_fast_shutdown_basic.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/innodb_fast_shutdown_basic.result 2008-07-25 14:00:28 +0000
@@ -125,3 +125,7 @@ SET @@global.innodb_fast_shutdown = FALS
SELECT @@global.innodb_fast_shutdown;
@@global.innodb_fast_shutdown
0
+SET @@global.innodb_fast_shutdown = @global_start_value;
+SELECT @@global.innodb_fast_shutdown;
+@@global.innodb_fast_shutdown
+1
=== modified file 'mysql-test/r/innodb_max_dirty_pages_pct_func.result'
--- a/mysql-test/r/innodb_max_dirty_pages_pct_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/innodb_max_dirty_pages_pct_func.result 2008-07-25 14:00:28 +0000
@@ -1,4 +1,8 @@
'#--------------------FN_DYNVARS_044_02-------------------------#'
+SET @start_value= @@global.innodb_max_dirty_pages_pct;
+SELECT @start_value;
+@start_value
+90
SET @@global.innodb_max_dirty_pages_pct = 80;
'connect (con1,localhost,root,,,,)'
'connection con1'
@@ -28,3 +32,8 @@ DROP PROCEDURE add_records;
DROP PROCEDURE add_until;
DROP PROCEDURE check_pct;
DROP FUNCTION dirty_pct;
+DROP TABLE t1;
+SET @@global.innodb_max_dirty_pages_pct= @start_value;
+SELECT @@global.innodb_max_dirty_pages_pct;
+@@global.innodb_max_dirty_pages_pct
+90
=== modified file 'mysql-test/r/innodb_table_locks_func.result'
--- a/mysql-test/r/innodb_table_locks_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/innodb_table_locks_func.result 2008-07-25 14:00:28 +0000
@@ -1,4 +1,8 @@
'#--------------------FN_DYNVARS_048_01-------------------------#'
+SET @start_value= @@global.innodb_table_locks;
+SELECT @start_value;
+@start_value
+1
SET @@global.innodb_table_locks = OFF;
'connect (con1,localhost,root,,,,)'
'connection con1'
@@ -30,3 +34,7 @@ COMMIT;
'CONNECTION con2'
UNLOCK tables;
DROP TABLE t1;
+SET @@global.innodb_table_locks= @start_value;
+SELECT @@global.innodb_table_locks;
+@@global.innodb_table_locks
+1
=== modified file 'mysql-test/r/interactive_timeout_func.result'
--- a/mysql-test/r/interactive_timeout_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/interactive_timeout_func.result 2008-07-25 14:00:28 +0000
@@ -6,6 +6,10 @@ id INT NOT NULL auto_increment,
PRIMARY KEY (id),
name VARCHAR(30)
);
+SET @start_value= @@global.interactive_timeout;
+SELECT @start_value;
+@start_value
+28800
'#--------------------FN_DYNVARS_052_01-------------------------#'
## Setting initial value of variable to 1 ##
SET @@global.interactive_timeout = 1;
@@ -28,3 +32,8 @@ id name
'Bug#35377: Error should appear here because interactive_timeout value';
'is 1 and connection remains idle for 5 secs';
INSERT into t1(name) values('Record_2');
+DROP TABLE t1;
+SET @@global.interactive_timeout= @start_value;
+SELECT @@global.interactive_timeout;
+@@global.interactive_timeout
+28800
=== modified file 'mysql-test/r/key_buffer_size_func.result'
--- a/mysql-test/r/key_buffer_size_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/key_buffer_size_func.result 2008-07-25 14:00:28 +0000
@@ -7,6 +7,10 @@ PRIMARY KEY (id),
rollno int NOT NULL,
name VARCHAR(30)
);
+SET @start_value= @@global.key_buffer_size;
+SELECT @start_value;
+@start_value
+1048576
FLUSH STATUS;
'#--------------------FN_DYNVARS_055_01-------------------------#'
## Setting initial value of variable to 131072 ##
@@ -34,3 +38,7 @@ INSERT into t1(rollno, name) values(4, '
## Dropping table ##
DROP table if exists t1;
## Disconnecting both the connections ##
+SET @@global.key_buffer_size= @start_value;
+SELECT @@global.key_buffer_size;
+@@global.key_buffer_size
+1048576
=== modified file 'mysql-test/r/log_basic.result'
--- a/mysql-test/r/log_basic.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/log_basic.result 2008-07-25 14:00:28 +0000
@@ -1,4 +1,5 @@
'#--------------------FN_DYNVARS_062_01------------------#'
+SET @start_log= @@global.log;
SELECT @@global.log AS INIT_VALUE;
INIT_VALUE
1
@@ -15,3 +16,4 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='log';
VARIABLE_VALUE
OFF
+SET @@global.log= @start_log;
=== modified file 'mysql-test/r/log_bin_trust_function_creators_func.result'
--- a/mysql-test/r/log_bin_trust_function_creators_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/log_bin_trust_function_creators_func.result 2008-07-25 14:00:28 +0000
@@ -1,5 +1,9 @@
drop table if exists t1;
'#--------------------FN_DYNVARS_063_01-------------------------#'
+SET @start_value= @@global.log_bin_trust_function_creators;
+SELECT @start_value;
+@start_value
+1
## Creating new user tt ##
CREATE user tt@localhost;
## Setting value of variable to 0 ##
@@ -69,3 +73,7 @@ drop function f1;
## Dropping table t1 & t2 ##
drop table t1,t2;
## Disconnecting both the connections ##
+SET @@global.log_bin_trust_function_creators= @start_value;
+SELECT @global.log_bin_trust_function_creators;
+@stripped
+NULL
=== modified file 'mysql-test/r/log_output_func.result'
--- a/mysql-test/r/log_output_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/log_output_func.result 2008-07-25 14:00:28 +0000
@@ -1,3 +1,7 @@
+SET @start_value= @@global.log_output;
+SELECT @start_value;
+@start_value
+FILE,TABLE
'#--------------------FN_DYNVARS_065_01-------------------------#'
SET @@global.log_output = 'NONE';
'connect (con1,localhost,root,,,,)'
@@ -51,3 +55,6 @@ SELECT count(*) from mysql.general_log;
count(*)
0
DROP TABLE t1;
+SELECT @@global.log_output;
+@@global.log_output
+FILE
=== modified file 'mysql-test/r/log_queries_not_using_indexes_basic.result'
--- a/mysql-test/r/log_queries_not_using_indexes_basic.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/log_queries_not_using_indexes_basic.result 2008-07-25 14:00:28 +0000
@@ -1,3 +1,7 @@
+SET @start_value= @@global.log_queries_not_using_indexes;
+SELECT @start_value;
+@start_value
+0
'#---------------------BS_STVARS_041_01----------------------#'
SELECT COUNT(@@GLOBAL.log_queries_not_using_indexes);
COUNT(@@GLOBAL.log_queries_not_using_indexes)
@@ -51,3 +55,7 @@ COUNT(@@GLOBAL.log_queries_not_using_ind
SELECT log_queries_not_using_indexes = @@SESSION.log_queries_not_using_indexes;
ERROR 42S22: Unknown column 'log_queries_not_using_indexes' in 'field list'
Expected error 'Readonly variable'
+SET @@global.log_queries_not_using_indexes= @start_value;
+SELECT @@global.log_queries_not_using_indexes;
+@@global.log_queries_not_using_indexes
+0
=== modified file 'mysql-test/r/max_allowed_packet_func.result'
--- a/mysql-test/r/max_allowed_packet_func.result 2008-04-18 09:38:41 +0000
+++ b/mysql-test/r/max_allowed_packet_func.result 2008-07-25 14:00:28 +0000
@@ -1,4 +1,8 @@
1048576
+SET @start_value= @@global.net_buffer_length;
+SELECT @start_value;
+@start_value
+16384
drop table if exists t1;
## Creating new table t1 ##
CREATE TABLE t1
@@ -43,5 +47,6 @@ SELECT @@global.net_buffer_length;
INSERT into t1(name) values("aaassssssssddddddddffffffgggggggg, askdlfjalsdkjfalksdjflaksdjfalkjdflaksjdflakjdflajsflajflajdfalsjfdlajfladjslfajdflajdsflajsflakjsdfla;kjflsdjkf;aljfa;lkdsfjla;sjlkajffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllakjsdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa;;;;;;;;;;;;;;;;;;;;;;;;;;;dsklfjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj!
jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkljffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdkskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk");
drop table t1;
SET @@global.max_allowed_packet = 1048576;
+SET @@global.net_buffer_length= @start_value;
## Server disconnects after this case and error occurs that Server ##
## has gone away ##
=== modified file 'mysql-test/r/max_seeks_for_key_func.result'
--- a/mysql-test/r/max_seeks_for_key_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/max_seeks_for_key_func.result 2008-07-25 14:00:28 +0000
@@ -3,6 +3,10 @@ CREATE TABLE t1
(a int auto_increment primary key,
b char(20)
);
+SET @start_value= @@global.max_seeks_for_key;
+SELECT @start_value;
+@start_value
+4294967295
'#--------------------FN_DYNVARS_084_01-------------------------#'
SELECT @@global.max_seeks_for_key = 10;
@@global.max_seeks_for_key = 10
@@ -73,3 +77,7 @@ id select_type table type possible_keys
1 SIMPLE t2 ALL NULL NULL NULL NULL 17 Using where; Using join buffer
SET MAX_SEEKS_FOR_KEY=DEFAULT;
drop table t1;
+SET @@global.max_seeks_for_key= @start_value;
+SELECT @@global.max_seeks_for_key;
+@@global.max_seeks_for_key
+4294967295
=== modified file 'mysql-test/r/max_sort_length_func.result'
--- a/mysql-test/r/max_sort_length_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/max_sort_length_func.result 2008-07-25 14:00:28 +0000
@@ -1,3 +1,7 @@
+SET @start_value= @@global.max_sort_length;
+SELECT @start_value;
+@start_value
+1024
SET @session_max_sort_length = @@Session.max_sort_length;
DROP TABLE IF EXISTS t;
** creating tables **
@@ -296,3 +300,7 @@ SET @@SESSION.max_sort_length = @session
DROP TABLE IF EXISTS t;
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
+SET @@global.max_sort_length= @start_value;
+SELECT @@global.max_sort_length;
+@@global.max_sort_length
+1024
=== modified file 'mysql-test/r/myisam_stats_method_func.result'
--- a/mysql-test/r/myisam_stats_method_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/myisam_stats_method_func.result 2008-07-25 14:00:28 +0000
@@ -1,4 +1,8 @@
'#--------------------FN_DYNVARS_097_01-------------------------#'
+SET @start_value= @@global.myisam_stats_method;
+SELECT @start_value;
+@start_value
+nulls_unequal
SET @@global.myisam_stats_method = nulls_equal;
'connect (con1,localhost,root,,,,)'
'connection con1'
@@ -83,3 +87,7 @@ t1 1 a 3 c A 0 NULL NULL YES BTREE
t1 1 a 4 d A 0 NULL NULL YES BTREE
SET myisam_stats_method=DEFAULT;
DROP TABLE t1;
+SET @@global.myisam_stats_method= @start_value;
+SELECT @@global.myisam_stats_method;
+@@global.myisam_stats_method
+nulls_unequal
=== modified file 'mysql-test/r/query_cache_limit_func.result'
--- a/mysql-test/r/query_cache_limit_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/query_cache_limit_func.result 2008-07-25 14:00:28 +0000
@@ -1,6 +1,8 @@
** Setup **
SET @global_query_cache_limit = @@global.query_cache_limit;
+SET @global_query_cache_size= @@global.query_cache_size;
+SET @global_query_cache_type= @@global.query_cache_type;
** warnings **
DROP TABLE IF EXISTS t;
** creating table **
@@ -112,4 +114,6 @@ Variable_name Value
Qcache_queries_in_cache 1
1 Expected
SET @@GLOBAL.query_cache_limit = @global_query_cache_limit;
+SET GLOBAL query_cache_size = @global_query_cache_size;
+SET GLOBAL query_cache_type = @global_query_cache_type;
DROP TABLE IF EXISTS t;
=== modified file 'mysql-test/r/query_cache_type_func.result'
--- a/mysql-test/r/query_cache_type_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/query_cache_type_func.result 2008-07-25 14:00:28 +0000
@@ -4,6 +4,7 @@
** Connection con0 **
SET @start_global_value = @@GLOBAL.query_cache_type;
SET @start_session_value = @@SESSION.query_cache_type;
+SET @start_query_cache_size= @@global.query_cache_size;
CREATE TABLE t1(id int, value varchar(10));
INSERT INTO t1 VALUES(1, 'val1');
INSERT INTO t1 VALUES(2, 'val2');
@@ -216,6 +217,7 @@ Disconnecting con1,con2,con3
** Connection con0 **
SET @@GLOBAL.query_cache_type = @start_global_value;
SET @@SESSION.query_cache_type = @start_session_value;
+SET GLOBAL query_cache_size = @start_query_cache_size;
DROP TABLE t1;
DROP PROCEDURE testProcHit;
Disconnecting con0
=== modified file 'mysql-test/r/query_prealloc_size_func.result'
--- a/mysql-test/r/query_prealloc_size_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/query_prealloc_size_func.result 2008-07-25 14:00:28 +0000
@@ -36,3 +36,4 @@ SELECT @@GLOBAL.query_prealloc_size;
@@GLOBAL.query_prealloc_size
8192
Expected Value : 8192;
+DROP TABLE t1;
=== modified file 'mysql-test/r/rpl_max_binlog_size_func.result'
--- a/mysql-test/r/rpl_max_binlog_size_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/rpl_max_binlog_size_func.result 2008-07-25 14:00:28 +0000
@@ -1,5 +1,14 @@
DROP TABLE IF EXISTS t1;
+SET @start_value= @@global.max_binlog_size;
+SELECT @start_value;
+@start_value
+1073741824
'--- check if log file is rotated after 4096 bytes ----'
SET @@global.max_binlog_size = 4096;
CREATE TABLE t1(a CHAR(5));
'mylog.000002 exists'
+DROP TABLE t1;
+SET @@global.max_binlog_size= @start_value;
+SELECT @@global.max_binlog_size;
+@@global.max_binlog_size
+1073741824
=== modified file 'mysql-test/r/slow_query_log_file_basic.result'
--- a/mysql-test/r/slow_query_log_file_basic.result 2008-05-20 18:23:58 +0000
+++ b/mysql-test/r/slow_query_log_file_basic.result 2008-07-25 14:00:28 +0000
@@ -17,3 +17,7 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
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/suite/sys_vars/inc/sort_buffer_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc 2008-07-25 14:00:28 +0000
@@ -23,7 +23,7 @@
# #
###############################################################################
---source include/load_sysvars.inc
+#--source include/load_sysvars.inc
########################################################################
@@ -77,10 +77,10 @@ SELECT @@session.sort_buffer_size = 2097
# Change the value of sort_buffer_size to a valid value for GLOBAL Scope #
################################################################################
-SET @@global.sort_buffer_size = 32776;
-SELECT @@global.sort_buffer_size= 32776 OR @@global.sort_buffer_size= 32804;
-SET @@global.sort_buffer_size = 32777;
-SELECT @@global.sort_buffer_size= 32777 OR @@global.sort_buffer_size= 32804;
+SET @@global.sort_buffer_size = 32804;
+#SELECT @@global.sort_buffer_size= 32776 ;
+#SET @@global.sort_buffer_size = 32777;
+SELECT @@global.sort_buffer_size;
SET @@global.sort_buffer_size = 4294967295;
SELECT @@global.sort_buffer_size;
SET @@global.sort_buffer_size = 4294967294;
=== modified file 'mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test 2008-07-25 14:00:28 +0000
@@ -4,6 +4,6 @@
# Wrapper for 64 bit machines #
################################################################################
---source include/have_64bit.inc
+#--source include/have_64bit.inc
--source suite/sys_vars/inc/sort_buffer_size_basic.inc
=== modified file 'mysql-test/t/binlog_format_basic.test'
--- a/mysql-test/t/binlog_format_basic.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/binlog_format_basic.test 2008-07-25 14:00:28 +0000
@@ -26,6 +26,9 @@
####################################################################
# Displaying default value #
####################################################################
+SET @start_value= @@global.binlog_format;
+SELECT @start_value;
+
SELECT COUNT(@@GLOBAL.binlog_format);
--echo 1 Expected
@@ -109,5 +112,6 @@ SELECT COUNT(@@SESSION.binlog_format);
SELECT COUNT(@@GLOBAL.binlog_format);
--echo 1 Expected
-
+SET @@global.binlog_format= @start_value;
+SELECT @@global.binlog_format;
=== modified file 'mysql-test/t/character_set_connection_func.test'
--- a/mysql-test/t/character_set_connection_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/character_set_connection_func.test 2008-07-25 14:00:28 +0000
@@ -97,6 +97,8 @@ SET @@session.character_set_connection =
SET @@session.character_set_client = @session_character_set_client;
SET @@session.character_set_results = @session_character_set_results;
+DROP TABLE t1;
+
#############################################################
# End of functionality Testing for character_set_connection #
#############################################################
=== modified file 'mysql-test/t/completion_type_func.test'
--- a/mysql-test/t/completion_type_func.test 2008-04-16 08:23:07 +0000
+++ b/mysql-test/t/completion_type_func.test 2008-07-25 14:00:28 +0000
@@ -104,3 +104,9 @@ ROLLBACK;
--Error 2006,2013,1053
INSERT into t1(name) values('Record_4');
+connection default;
+disconnect test_con1;
+disconnect test_con2;
+
+DROP TABLE t1;
+
=== modified file 'mysql-test/t/concurrent_insert_func.test'
--- a/mysql-test/t/concurrent_insert_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/concurrent_insert_func.test 2008-07-25 14:00:28 +0000
@@ -41,6 +41,9 @@ name varchar(30)
# for MyISAM tables that don't have holes
####################################################################
+SET @start_value= @@global.concurrent_insert;
+SELECT @start_value;
+
--echo ## Setting initial value of variable to 1 ##
SET @@global.concurrent_insert = 1;
INSERT into t1(name) values('Record_1');
@@ -138,3 +141,5 @@ DROP table t1;
--echo ## Disconnecting connection ##
disconnect test_con1;
+SET @@global.concurrent_insert= @start_value;
+
=== modified file 'mysql-test/t/delay_key_write_func.test'
--- a/mysql-test/t/delay_key_write_func.test 2008-04-15 13:44:11 +0000
+++ b/mysql-test/t/delay_key_write_func.test 2008-07-25 14:00:28 +0000
@@ -24,6 +24,8 @@
# Check if setting delay_key_write is changed in every new connection #
#######################################################################
+SET @start_value= @@global.delay_key_write;
+SELECT @start_value;
SET @@global.delay_key_write = ON;
SELECT @@global.delay_key_write;
@@ -144,6 +146,8 @@ select count(*) from t1;
DROP PROCEDURE sp_addRecords;
DROP TABLE t1;
+SELECT @@global.delay_key_write;
+
####################################################
# End of functionality testing for delay_key_write #
####################################################
=== modified file 'mysql-test/t/general_log_file_basic.test'
--- a/mysql-test/t/general_log_file_basic.test 2008-05-20 18:23:58 +0000
+++ b/mysql-test/t/general_log_file_basic.test 2008-07-25 14:00:28 +0000
@@ -67,7 +67,10 @@ SELECT @@global.general_log_file = VARIA
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/innodb_autoextend_increment_basic.test'
--- a/mysql-test/t/innodb_autoextend_increment_basic.test 2008-04-14 15:21:18 +0000
+++ b/mysql-test/t/innodb_autoextend_increment_basic.test 2008-07-25 14:00:28 +0000
@@ -1,27 +1,26 @@
-################# mysql-test\t\innodb_autoextend_increment _basic.test ###################
-# #
-# Variable Name: innodb_autoextend_increment #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: Numeric #
-# Default Value: 8 #
-# Range: 0,1 #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan #
-# #
-#Description:Test Cases of Dynamic System Variable innodb_autoextend_increment#
-# that checks the behavior of this variable in the following ways #
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
+################# mysql-test\t\innodb_autoextend_increment _basic.test ###########
+# #
+# Variable Name: innodb_autoextend_increment #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: Numeric #
+# Default Value: 8 #
+# Range: 0,1 #
+# #
+# #
+# Creation Date: 2008-02-07 #
+# Author: Rizwan #
+# #
+#Description:Test Cases of Dynamic System Variable innodb_autoextend_increment #
+# that checks the behavior of this variable in the following ways #
+# * Default Value #
+# * Valid & Invalid values #
+# * Scope & Access method #
+# * Data Integrity #
+# #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
+# #
+##################################################################################
--source include/have_innodb.inc
--source include/load_sysvars.inc
@@ -32,7 +31,7 @@
################################################################################
-# Saving initial value of innodb_autoextend_increment in a temporary variable#
+# Saving initial value of innodb_autoextend_increment in a temporary variable #
################################################################################
@@ -53,7 +52,7 @@ SET @@global.innodb_autoextend_increment
SELECT @@global.innodb_autoextend_increment ;
--echo '#---------------------FN_DYNVARS_046_02-------------------------#'
-####################################################################################
+####################################################################################
# Check if innodb_autoextend_increment can be accessed with and without @@ sign #
####################################################################################
@@ -72,7 +71,7 @@ SELECT @@global.innodb_autoextend_increm
--echo '#--------------------FN_DYNVARS_046_03------------------------#'
##########################################################################
-# change the value of innodb_autoextend_increment to a valid value #
+# change the value of innodb_autoextend_increment to a valid value #
##########################################################################
@@ -84,7 +83,7 @@ SELECT @@global.innodb_autoextend_increm
--echo '#--------------------FN_DYNVARS_046_04-------------------------#'
###########################################################################
-# Change the value of innodb_autoextend_increment to invalid value #
+# Change the value of innodb_autoextend_increment to invalid value #
###########################################################################
@@ -152,9 +151,10 @@ SELECT @@global.innodb_autoextend_increm
##############################
-#SET @@global.innodb_autoextend_increment = @global_start_value;
-#SELECT @@global.innodb_autoextend_increment ;
+SET @@global.innodb_autoextend_increment = @global_start_value;
+SELECT @@global.innodb_autoextend_increment ;
###############################################################
-# END OF innodb_autoextend_increment TESTS #
+# END OF innodb_autoextend_increment TESTS #
###############################################################
+
=== modified file 'mysql-test/t/innodb_autoinc_lock_mode_func.test'
--- a/mysql-test/t/innodb_autoinc_lock_mode_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/innodb_autoinc_lock_mode_func.test 2008-07-25 14:00:28 +0000
@@ -50,6 +50,8 @@ INSERT INTO t1 (a,b) VALUES (NULL,'e');
--echo 'the new auto incremented value should be 104'
SELECT * from t1;
+DROP TABLE t1;
+
###############################################################
# End of functionality Testing for innodb_autoinc_lock_mode #
###############################################################
=== modified file 'mysql-test/t/innodb_fast_shutdown_basic.test'
--- a/mysql-test/t/innodb_fast_shutdown_basic.test 2008-04-14 15:21:18 +0000
+++ b/mysql-test/t/innodb_fast_shutdown_basic.test 2008-07-25 14:00:28 +0000
@@ -185,8 +185,8 @@ SELECT @@global.innodb_fast_shutdown;
# Restore initial value #
##############################
-#SET @@innodb_fast_shutdown = @global_start_value;
-#SELECT @@innodb_fast_shutdown;
+SET @@global.innodb_fast_shutdown = @global_start_value;
+SELECT @@global.innodb_fast_shutdown;
########################################################################
# END OF innodb_fast_shutdown TESTS #
=== modified file 'mysql-test/t/innodb_max_dirty_pages_pct_func.test'
--- a/mysql-test/t/innodb_max_dirty_pages_pct_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/innodb_max_dirty_pages_pct_func.test 2008-07-25 14:00:28 +0000
@@ -25,6 +25,9 @@
# Check if setting innodb_max_dirty_pages_pct is changed in new connection#
###########################################################################
+SET @start_value= @@global.innodb_max_dirty_pages_pct;
+SELECT @start_value;
+
SET @@global.innodb_max_dirty_pages_pct = 80;
--echo 'connect (con1,localhost,root,,,,)'
connect (con1,localhost,root,,,,);
@@ -157,6 +160,10 @@ DROP PROCEDURE add_records;
DROP PROCEDURE add_until;
DROP PROCEDURE check_pct;
DROP FUNCTION dirty_pct;
+DROP TABLE t1;
+
+SET @@global.innodb_max_dirty_pages_pct= @start_value;
+SELECT @@global.innodb_max_dirty_pages_pct;
##################################################################
# End of functionality Testing for innodb_max_dirty_pages_pct #
=== modified file 'mysql-test/t/innodb_table_locks_func.test'
--- a/mysql-test/t/innodb_table_locks_func.test 2008-04-22 13:04:10 +0000
+++ b/mysql-test/t/innodb_table_locks_func.test 2008-07-25 14:00:28 +0000
@@ -27,6 +27,9 @@
# Check if setting innodb_table_locks is changed in new connection #
####################################################################
+SET @start_value= @@global.innodb_table_locks;
+SELECT @start_value;
+
SET @@global.innodb_table_locks = OFF;
--echo 'connect (con1,localhost,root,,,,)'
connect (con1,localhost,root,,,,);
@@ -80,6 +83,9 @@ UNLOCK tables;
DROP TABLE t1;
disconnect con2;
+connection default;
+SET @@global.innodb_table_locks= @start_value;
+SELECT @@global.innodb_table_locks;
##########################################################
# End of functionality Testing for innodb_table_locks #
=== modified file 'mysql-test/t/interactive_timeout_func.test'
--- a/mysql-test/t/interactive_timeout_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/interactive_timeout_func.test 2008-07-25 14:00:28 +0000
@@ -36,6 +36,8 @@ PRIMARY KEY (id),
name VARCHAR(30)
);
+SET @start_value= @@global.interactive_timeout;
+SELECT @start_value;
--echo '#--------------------FN_DYNVARS_052_01-------------------------#'
#######################################################################
@@ -68,3 +70,13 @@ SELECT * from t1;
--echo 'is 1 and connection remains idle for 5 secs';
INSERT into t1(name) values('Record_2');
+
+connection default;
+
+disconnect test_con1;
+
+DROP TABLE t1;
+
+SET @@global.interactive_timeout= @start_value;
+SELECT @@global.interactive_timeout;
+
=== modified file 'mysql-test/t/key_buffer_size_func.test'
--- a/mysql-test/t/key_buffer_size_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/key_buffer_size_func.test 2008-07-25 14:00:28 +0000
@@ -36,6 +36,9 @@ rollno int NOT NULL,
name VARCHAR(30)
);
+SET @start_value= @@global.key_buffer_size;
+SELECT @start_value;
+
FLUSH STATUS;
--echo '#--------------------FN_DYNVARS_055_01-------------------------#'
@@ -97,4 +100,7 @@ DROP table if exists t1;
DISCONNECT test_con2;
DISCONNECT test_con1;
+connection default;
+SET @@global.key_buffer_size= @start_value;
+SELECT @@global.key_buffer_size;
=== modified file 'mysql-test/t/log_basic.test'
--- a/mysql-test/t/log_basic.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/log_basic.test 2008-07-25 14:00:28 +0000
@@ -34,6 +34,8 @@
# Accessing variable #
#############################################################
+SET @start_log= @@global.log;
+
SELECT @@global.log AS INIT_VALUE;
SELECT @@log AS INIT_VALUE;
@@ -55,6 +57,9 @@ SELECT VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='log';
+SET @@global.log= @start_log;
+
############################################
# END OF log TESTS #
############################################
+
=== modified file 'mysql-test/t/log_bin_trust_function_creators_func.test'
--- a/mysql-test/t/log_bin_trust_function_creators_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/log_bin_trust_function_creators_func.test 2008-07-25 14:00:28 +0000
@@ -30,6 +30,8 @@ drop table if exists t1;
# Setting initial value of variable to 0 and verifying whether user
# is allowed to create function or not.
########################################################################
+SET @start_value= @@global.log_bin_trust_function_creators;
+SELECT @start_value;
--echo ## Creating new user tt ##
CREATE user tt@localhost;
@@ -119,3 +121,8 @@ drop table t1,t2;
--echo ## Disconnecting both the connections ##
disconnect test_con2;
+connection default;
+
+SET @@global.log_bin_trust_function_creators= @start_value;
+SELECT @global.log_bin_trust_function_creators;
+
=== modified file 'mysql-test/t/log_output_func.test'
--- a/mysql-test/t/log_output_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/log_output_func.test 2008-07-25 14:00:28 +0000
@@ -23,6 +23,9 @@
# ps-protocol. So, it is switched off.
--disable_ps_protocol
+SET @start_value= @@global.log_output;
+SELECT @start_value;
+
--echo '#--------------------FN_DYNVARS_065_01-------------------------#'
##################################################################
# Check if setting log_output is changed in every new connection #
@@ -106,7 +109,10 @@ SELECT count(*) from mysql.general_log;
DROP TABLE t1;
+SELECT @@global.log_output;
+
--enable_ps_protocol
####################################################
# Endo of functionality Testing for log_output #
####################################################
+
=== modified file 'mysql-test/t/log_queries_not_using_indexes_basic.test'
--- a/mysql-test/t/log_queries_not_using_indexes_basic.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/log_queries_not_using_indexes_basic.test 2008-07-25 14:00:28 +0000
@@ -22,6 +22,9 @@
# #
###############################################################################
+SET @start_value= @@global.log_queries_not_using_indexes;
+SELECT @start_value;
+
--echo '#---------------------BS_STVARS_041_01----------------------#'
####################################################################
# Displaying default value #
@@ -100,4 +103,6 @@ SELECT COUNT(@@GLOBAL.log_queries_not_us
SELECT log_queries_not_using_indexes = @@SESSION.log_queries_not_using_indexes;
--echo Expected error 'Readonly variable'
+SET @@global.log_queries_not_using_indexes= @start_value;
+SELECT @@global.log_queries_not_using_indexes;
=== modified file 'mysql-test/t/max_allowed_packet_func.test'
--- a/mysql-test/t/max_allowed_packet_func.test 2008-04-23 09:36:17 +0000
+++ b/mysql-test/t/max_allowed_packet_func.test 2008-07-25 14:00:28 +0000
@@ -24,6 +24,8 @@
let $start_global_value = `SELECT @@global.max_allowed_packet`;
--echo $start_global_value
+SET @start_value= @@global.net_buffer_length;
+SELECT @start_value;
--disable_warnings
drop table if exists t1;
@@ -88,6 +90,7 @@ disconnect test_con1;
connection default;
drop table t1;
eval SET @@global.max_allowed_packet = $start_global_value;
+SET @@global.net_buffer_length= @start_value;
--echo ## Server disconnects after this case and error occurs that Server ##
--echo ## has gone away ##
=== modified file 'mysql-test/t/max_seeks_for_key_func.test'
--- a/mysql-test/t/max_seeks_for_key_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/max_seeks_for_key_func.test 2008-07-25 14:00:28 +0000
@@ -18,7 +18,8 @@ CREATE TABLE t1
b char(20)
);
-
+SET @start_value= @@global.max_seeks_for_key;
+SELECT @start_value;
--echo '#--------------------FN_DYNVARS_084_01-------------------------#'
##########################################################
@@ -73,11 +74,6 @@ INSERT into t1(b) values("BREc");
INSERT into t1(b) values("CRec");
explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b;
-
-
-
-
-
#####################################################
# Inserting values in table t and analyzing table #
#####################################################
@@ -99,6 +95,12 @@ SET MAX_SEEKS_FOR_KEY=1;
explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b;
SET MAX_SEEKS_FOR_KEY=DEFAULT;
+connection default;
+disconnect test_con1;
+disconnect test_con2;
+
drop table t1;
+SET @@global.max_seeks_for_key= @start_value;
+SELECT @@global.max_seeks_for_key;
=== modified file 'mysql-test/t/max_sort_length_func.test'
--- a/mysql-test/t/max_sort_length_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/max_sort_length_func.test 2008-07-25 14:00:28 +0000
@@ -24,6 +24,9 @@
# Setup
#
+SET @start_value= @@global.max_sort_length;
+SELECT @start_value;
+
SET @session_max_sort_length = @@Session.max_sort_length;
@@ -251,3 +254,6 @@ DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
--enable_warnings
+SET @@global.max_sort_length= @start_value;
+SELECT @@global.max_sort_length;
+
=== modified file 'mysql-test/t/myisam_stats_method_func.test'
--- a/mysql-test/t/myisam_stats_method_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/myisam_stats_method_func.test 2008-07-25 14:00:28 +0000
@@ -24,6 +24,9 @@
# Check if Setting myisam_stats_method is changed in new connection #
#####################################################################
+SET @start_value= @@global.myisam_stats_method;
+SELECT @start_value;
+
SET @@global.myisam_stats_method = nulls_equal;
--echo 'connect (con1,localhost,root,,,,)'
connect (con1,localhost,root,,,,);
@@ -101,6 +104,10 @@ SHOW INDEX FROM t1;
SET myisam_stats_method=DEFAULT;
DROP TABLE t1;
+SET @@global.myisam_stats_method= @start_value;
+SELECT @@global.myisam_stats_method;
+
########################################################
# End of functionality Testing for myisam_stats_method #
########################################################
+
=== modified file 'mysql-test/t/query_cache_limit_func.test'
--- a/mysql-test/t/query_cache_limit_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/query_cache_limit_func.test 2008-07-25 14:00:28 +0000
@@ -28,6 +28,8 @@
#
SET @global_query_cache_limit = @@global.query_cache_limit;
+SET @global_query_cache_size= @@global.query_cache_size;
+SET @global_query_cache_type= @@global.query_cache_type;
--echo ** warnings **
--disable_warnings
@@ -167,7 +169,10 @@ SHOW STATUS LIKE 'Qcache_queries_in_cach
#
SET @@GLOBAL.query_cache_limit = @global_query_cache_limit;
+SET GLOBAL query_cache_size = @global_query_cache_size;
+SET GLOBAL query_cache_type = @global_query_cache_type;
--disable_warnings
DROP TABLE IF EXISTS t;
--enable_warnings
+
=== modified file 'mysql-test/t/query_cache_type_func.test'
--- a/mysql-test/t/query_cache_type_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/query_cache_type_func.test 2008-07-25 14:00:28 +0000
@@ -36,6 +36,7 @@ connection con0;
SET @start_global_value = @@GLOBAL.query_cache_type;
SET @start_session_value = @@SESSION.query_cache_type;
+SET @start_query_cache_size= @@global.query_cache_size;
#
# Creating test table
@@ -305,6 +306,7 @@ connection con0;
SET @@GLOBAL.query_cache_type = @start_global_value;
SET @@SESSION.query_cache_type = @start_session_value;
+SET GLOBAL query_cache_size = @start_query_cache_size;
DROP TABLE t1;
=== modified file 'mysql-test/t/query_prealloc_size_func.test'
--- a/mysql-test/t/query_prealloc_size_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/query_prealloc_size_func.test 2008-07-25 14:00:28 +0000
@@ -84,3 +84,5 @@ connection default;
disconnect con_int1;
disconnect con_int2;
+DROP TABLE t1;
+
=== modified file 'mysql-test/t/rpl_max_binlog_size_func.test'
--- a/mysql-test/t/rpl_max_binlog_size_func.test 2008-04-14 15:21:18 +0000
+++ b/mysql-test/t/rpl_max_binlog_size_func.test 2008-07-25 14:00:28 +0000
@@ -7,6 +7,8 @@ source include/have_log_bin.inc;
DROP TABLE IF EXISTS t1;
--enable_warnings
+SET @start_value= @@global.max_binlog_size;
+SELECT @start_value;
#==============================================================
--echo '--- check if log file is rotated after 4096 bytes ----'
@@ -32,6 +34,11 @@ dec $a;
--echo 'mylog.000002 exists'
+DROP TABLE t1;
+
+SET @@global.max_binlog_size= @start_value;
+SELECT @@global.max_binlog_size;
+
###############################################################################
# End of functionality testing for max_binlog_size #
###############################################################################
=== modified file 'mysql-test/t/slow_query_log_file_basic.test'
--- a/mysql-test/t/slow_query_log_file_basic.test 2008-05-20 18:23:58 +0000
+++ b/mysql-test/t/slow_query_log_file_basic.test 2008-07-25 14:00:28 +0000
@@ -66,7 +66,10 @@ SELECT @@global.slow_query_log_file = VA
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:2676) Bug#38349, Bug#36536 | Horst Hunger | 25 Jul |
