| List: | Commits | « Previous MessageNext Message » | |
| From: | Horst Hunger | Date: | August 20 2008 6:36pm |
| Subject: | bzr commit into mysql-5.1 branch (horst:2679) Bug#38349 | ||
| View as plain text | |||
#At file:///work/bzr/5.1-clean/
2679 Horst Hunger 2008-08-20
Some improvements and missing fixes for bug#38349.
modified:
mysql-test/r/delay_key_write_func.result
mysql-test/r/log_bin_trust_function_creators_func.result
mysql-test/r/log_output_func.result
mysql-test/r/rpl_init_slave_func.result
mysql-test/t/delay_key_write_func.test
mysql-test/t/general_log_file_basic.test
mysql-test/t/log_bin_trust_function_creators_func.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 17:10:55 +0000
+++ b/mysql-test/r/delay_key_write_func.result 2008-08-20 16:36:29 +0000
@@ -1,8 +1,5 @@
'#--------------------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
@@ -70,6 +67,3 @@ count(*)
DROP PROCEDURE sp_addRecords;
DROP TABLE t1;
SET @@global.delay_key_write= @start_value;
-SELECT @@global.delay_key_write;
-@@global.delay_key_write
-ON
=== modified file 'mysql-test/r/log_bin_trust_function_creators_func.result'
--- a/mysql-test/r/log_bin_trust_function_creators_func.result 2008-07-25 14:00:28 +0000
+++ b/mysql-test/r/log_bin_trust_function_creators_func.result 2008-08-20 16:36:29 +0000
@@ -73,6 +73,7 @@ drop function f1;
## Dropping table t1 & t2 ##
drop table t1,t2;
## Disconnecting both the connections ##
+DROP USER tt@localhost;
SET @@global.log_bin_trust_function_creators= @start_value;
SELECT @global.log_bin_trust_function_creators;
@global.log_bin_trust_function_creators
=== modified file 'mysql-test/r/log_output_func.result'
--- a/mysql-test/r/log_output_func.result 2008-07-25 17:10:55 +0000
+++ b/mysql-test/r/log_output_func.result 2008-08-20 16:36:29 +0000
@@ -1,7 +1,4 @@
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,,,,)'
=== modified file 'mysql-test/r/rpl_init_slave_func.result'
--- a/mysql-test/r/rpl_init_slave_func.result 2008-07-25 17:10:55 +0000
+++ b/mysql-test/r/rpl_init_slave_func.result 2008-08-20 16:36:29 +0000
@@ -47,3 +47,6 @@ 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;
+stop slave;
+reset slave;
+start slave;
=== modified file 'mysql-test/t/delay_key_write_func.test'
--- a/mysql-test/t/delay_key_write_func.test 2008-07-25 17:10:55 +0000
+++ b/mysql-test/t/delay_key_write_func.test 2008-08-20 16:36:29 +0000
@@ -1,23 +1,21 @@
-##################### mysql-test\t\delay_key_write_func.test #################
-# #
-# Variable Name: delay_key_write #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: enumeration #
-# Default Value: ON #
-# Valid Values: ON, OFF & ALL #
-# #
-# #
-# Creation Date: 2008-03-08 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable delay_key_write #
-# that checks the behavior of this variable #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
+##################### mysql-test\t\delay_key_write_func.test ####################
+# #
+# Variable Name: delay_key_write #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: enumeration #
+# Default Value: ON #
+# Valid Values: ON, OFF & ALL #
+# #
+# Creation Date: 2008-03-08 #
+# Author: Rizwan #
+# #
+# Description: Test Cases of Dynamic System Variable delay_key_write #
+# that checks the behavior of this variable #
+# #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
+# #
+##################################################################################
--echo '#--------------------FN_DYNVARS_023_01-------------------------#'
#######################################################################
@@ -25,7 +23,6 @@
#######################################################################
SET @start_value= @@global.delay_key_write;
-SELECT @start_value;
SET @@global.delay_key_write = ON;
SELECT @@global.delay_key_write;
@@ -149,8 +146,8 @@ disconnect user1;
connection default;
SET @@global.delay_key_write= @start_value;
-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-07-25 17:10:55 +0000
+++ b/mysql-test/t/general_log_file_basic.test 2008-08-20 16:36:29 +0000
@@ -1,27 +1,26 @@
-################### mysql-test\t\general_log_file_basic.test ###################
-# #
-# Variable Name: general_log_file #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: Filename #
-# Default Value: host_name.log #
-# Valid Values: #
-# #
-# #
-# Creation Date: 2008-03-16 #
-# Author: Salman Rawala #
-# #
-# Description: Test Cases of Dynamic System Variable "general_log_file" #
-# that checks 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#option_mysqld_general_log_file #
-# #
-################################################################################
+################### mysql-test\t\general_log_file_basic.test #####################
+# #
+# Variable Name: general_log_file #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: Filename #
+# Default Value: host_name.log #
+# Valid Values: #
+# #
+# #
+# Creation Date: 2008-03-16 #
+# Author: Salman Rawala #
+# #
+# Description: Test Cases of Dynamic System Variable "general_log_file" #
+# that checks 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/load_sysvars.inc
=== modified file 'mysql-test/t/log_bin_trust_function_creators_func.test'
--- a/mysql-test/t/log_bin_trust_function_creators_func.test 2008-07-25 14:00:28 +0000
+++ b/mysql-test/t/log_bin_trust_function_creators_func.test 2008-08-20 16:36:29 +0000
@@ -123,6 +123,7 @@ disconnect test_con2;
connection default;
+DROP USER tt@localhost;
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-07-25 17:10:55 +0000
+++ b/mysql-test/t/log_output_func.test 2008-08-20 16:36:29 +0000
@@ -1,30 +1,28 @@
-################# mysql-test\t\log_output_func.test ##########################
-# #
-# Variable Name: log_output #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: enumeration #
-# Default Value: TABLE #
-# Range: TABLE, FILE, NONE #
-# #
-# #
-# Creation Date: 2008-03-08 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable log_output #
-# that checks the behavior of this variable #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
+################# mysql-test\t\log_output_func.test #############################
+# #
+# Variable Name: log_output #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: enumeration #
+# Default Value: TABLE #
+# Range: TABLE, FILE, NONE #
+# #
+# #
+# Creation Date: 2008-03-08 #
+# Author: Rizwan #
+# #
+# Description: Test Cases of Dynamic System Variable log_output #
+# that checks the behavior of this variable #
+# #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
+# #
+##################################################################################
# The access to mysql.general_log delivers different result depending on
# ps-protocol. So, it is switched off.
--disable_ps_protocol
SET @start_value= @@global.log_output;
-SELECT @start_value;
--echo '#--------------------FN_DYNVARS_065_01-------------------------#'
##################################################################
@@ -116,6 +114,6 @@ SET @@global.log_output= @start_value;
--enable_ps_protocol
####################################################
-# Endo of functionality Testing for log_output #
+# End of functionality Testing for log_output #
####################################################
=== modified file 'mysql-test/t/rpl_init_slave_func.test'
--- a/mysql-test/t/rpl_init_slave_func.test 2008-07-25 17:10:55 +0000
+++ b/mysql-test/t/rpl_init_slave_func.test 2008-08-20 16:36:29 +0000
@@ -1,23 +1,22 @@
-###################### mysql-test\t\init_slave_func.test #####################
-# #
-# Variable Name: init_slave #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: string #
-# Default Value: #
-# Range: #
-# #
-# #
-# Creation Date: 2008-03-08 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable init_slave #
-# that checks the behavior of this variable #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
+###################### mysql-test\t\init_slave_func.test ########################
+# #
+# Variable Name: init_slave #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: string #
+# Default Value: #
+# Range: #
+# #
+# #
+# Creation Date: 2008-03-08 #
+# Author: Rizwan #
+# #
+# Description: Test Cases of Dynamic System Variable init_slave #
+# that checks the behavior of this variable #
+# #
+# Reference:http://dev.mysql.com/doc/refman/5.1/en/Rserver-system-variables.html #
+# #
+##################################################################################
source include/master-slave.inc;
@@ -92,9 +91,14 @@ SELECT @a;
# Restore value
set global max_connections= default;
-connection default;
+connection slave;
SET @@global.init_slave= @start_value;
+stop slave;
+--wait_for_slave_to_stop
+reset slave;
+# Clean up old test tables
+start slave;
##################################################
# 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 17:10:55 +0000
+++ b/mysql-test/t/slow_query_log_file_basic.test 2008-08-20 16:36:29 +0000
@@ -1,27 +1,26 @@
-################### mysql-test\t\slow_query_log_file_basic.test ################
-# #
-# Variable Name: slow_query_log_file #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: Filename #
-# Default Value: host_name-slow.log #
-# Valid Values: #
-# #
-# #
-# Creation Date: 2008-03-16 #
-# Author: Salman Rawala #
-# #
-# Description: Test Cases of Dynamic System Variable "slow_query_log_file" #
-# that checks 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#option_mysqld_slow_query_log_file #
-# #
-################################################################################
+################### mysql-test\t\slow_query_log_file_basic.test ##################
+# #
+# Variable Name: slow_query_log_file #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: Filename #
+# Default Value: host_name-slow.log #
+# Valid Values: #
+# #
+# #
+# Creation Date: 2008-03-16 #
+# Author: Salman Rawala #
+# #
+# Description: Test Cases of Dynamic System Variable "slow_query_log_file" #
+# that checks 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/load_sysvars.inc
| Thread | ||
|---|---|---|
| • bzr commit into mysql-5.1 branch (horst:2679) Bug#38349 | Horst Hunger | 21 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.647 sec. using MySQL 5.1.14-beta-log