Below is the list of changes that have just been committed into a local
6.0 repository of thek. When thek 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-14 22:29:02+02:00, thek@adventure.(none) +5 -0
Fix addressing failing test cases.
mysql-test/r/general_log_file_basic.result@stripped, 2008-05-14 22:29:00+02:00, thek@adventure.(none) +2 -1
Right value is considered to be a text entity per default if it isn't
a number and doesn't have any spaces.
mysql-test/t/disabled.def@stripped, 2008-05-14 22:29:00+02:00, thek@adventure.(none) +1 -0
Test disabled because of pending bug.
mysql-test/t/general_log_file_basic.test@stripped, 2008-05-14 22:29:00+02:00, thek@adventure.(none) +4 -1
Right value is considered to be a text entity per default if it isn't
a number and doesn't have any spaces.
mysql-test/t/log_output_basic.test@stripped, 2008-05-14 22:29:00+02:00, thek@adventure.(none) +15 -0
Legal values for log_output should be TABLE, FILE, or NONE
mysql-test/t/variables.test@stripped, 2008-05-14 22:29:00+02:00, thek@adventure.(none) +4 -0
Legal values for log_output are TABLE, FILE, or NONE
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-04-10 15:12:43 +02:00
+++ b/mysql-test/r/general_log_file_basic.result 2008-05-14 22:29:00 +02:00
@@ -9,7 +9,8 @@ log_file
master.log
'#--------------------FN_DYNVARS_004_02------------------------#'
SET @@global.general_log_file = mytest.log;
-ERROR 42000: Variable 'general_log_file' can't be set to the value of 'log'
+SET @@global.general_log_file = 12;
+ERROR 42000: Incorrect argument type to variable 'general_log_file'
'#----------------------FN_DYNVARS_004_03------------------------#'
SELECT @@global.general_log_file = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def 2008-05-14 11:53:13 +02:00
+++ b/mysql-test/t/disabled.def 2008-05-14 22:29:00 +02:00
@@ -39,3 +39,4 @@ user_limits : Bug#23921 random failu
key_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
rpl_recovery_rank_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
sort_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+log_output_basic : Bug#34820 log_output can be set to illegal value
diff -Nrup a/mysql-test/t/general_log_file_basic.test b/mysql-test/t/general_log_file_basic.test
--- a/mysql-test/t/general_log_file_basic.test 2008-04-10 15:13:52 +02:00
+++ b/mysql-test/t/general_log_file_basic.test 2008-05-14 22:29:00 +02:00
@@ -52,8 +52,11 @@ SELECT RIGHT(@@global.general_log_file,1
# Change the value of general_log_file to a invalid value #
#######################################################################
---Error ER_WRONG_VALUE_FOR_VAR
+# Assumed text if no quotes or numbers.
SET @@global.general_log_file = mytest.log;
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@global.general_log_file = 12;
+
--echo '#----------------------FN_DYNVARS_004_03------------------------#'
##############################################################################
diff -Nrup a/mysql-test/t/log_output_basic.test b/mysql-test/t/log_output_basic.test
--- a/mysql-test/t/log_output_basic.test 2008-04-10 15:13:59 +02:00
+++ b/mysql-test/t/log_output_basic.test 2008-05-14 22:29:00 +02:00
@@ -59,6 +59,7 @@ SELECT @@global.log_output;
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = NULL;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = "";
SELECT @@global.log_output;
--echo 'Bug# 34838: Empty value is allowed where as it is not specified in';
@@ -131,10 +132,14 @@ SET @@global.log_output = 'TABLE, FILE';
--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = ' TABLE,FILE';
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = ', ';
+--Error ER_WRONG_VALUE_FOR_VAR
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = ' ';
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = ' ';
SELECT @@global.log_output;
@@ -171,27 +176,35 @@ WHERE VARIABLE_NAME='log_output';
###################################################################
# test if variable accepts 0,1,2
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 0;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 1;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 2;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 3;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 4;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 5;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 6;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = 7;
SELECT @@global.log_output;
@@ -204,8 +217,10 @@ SET @@global.log_output = 8;
# Check if TRUE and FALSE values can be used on variable #
###################################################################
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = TRUE;
SELECT @@global.log_output;
+--Error ER_WRONG_VALUE_FOR_VAR
SET @@global.log_output = FALSE;
SELECT @@global.log_output;
diff -Nrup a/mysql-test/t/variables.test b/mysql-test/t/variables.test
--- a/mysql-test/t/variables.test 2008-03-31 12:53:23 +02:00
+++ b/mysql-test/t/variables.test 2008-05-14 22:29:00 +02:00
@@ -792,6 +792,10 @@ SET GLOBAL log_output = '';
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL log_output = 0;
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL log_output = NULL;
+
+
--echo
--echo # -- End of Bug#34820.
| Thread |
|---|
| • bk commit into 6.0 tree (thek:1.2634) | kpettersson | 14 May |
