diff options
| author | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 21:46:18 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 21:46:18 +0300 |
| commit | bae7b2672ea2f8f9273b32ee52d63a21b1a11aaf (patch) | |
| tree | a7a7b9849eaa03a893a0af9fd51cb3f72ed17382 /mysql-test/r/log_state.result | |
| parent | fba9e7c878359b0808e0f656d72aceedf34f0f56 (diff) | |
| download | mariadb-git-bae7b2672ea2f8f9273b32ee52d63a21b1a11aaf.tar.gz | |
Fix for Bug#32748: Inconsistent handling of assignments to
general_log_file/slow_query_log_file.
The problem was that log file path was rejected if directory
path was empty. The fix is to reject log file path only if it
is entirely empty.
mysql-test/r/log_state.result:
Update result file.
mysql-test/t/log_state.test:
A test case for Bug#32748: Inconsistent handling of assignments to
general_log_file/slow_query_log_file.
sql/set_var.cc:
Accept file path if dirname is empty.
Reject file path if it is empty.
Diffstat (limited to 'mysql-test/r/log_state.result')
| -rw-r--r-- | mysql-test/r/log_state.result | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index 8ecfe3b2094..c293956148f 100644 --- a/mysql-test/r/log_state.result +++ b/mysql-test/r/log_state.result @@ -249,4 +249,25 @@ set global slow_query_log_file= NULL; ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'NULL' set global general_log_file= @old_general_log_file; set global slow_query_log_file= @old_slow_query_log_file; + +# -- +# -- Bug#32748: Inconsistent handling of assignments to +# -- general_log_file/slow_query_log_file. +# -- + +SET @general_log_file_saved = @@global.general_log_file; +SET @slow_query_log_file_saved = @@global.slow_query_log_file; + +SET GLOBAL general_log_file = 'bug32748.query.log'; +SET GLOBAL slow_query_log_file = 'bug32748.slow.log'; + +SHOW VARIABLES LIKE '%log_file'; +Variable_name Value +general_log_file bug32748.query.log +slow_query_log_file bug32748.slow.log + +SET GLOBAL general_log_file = @general_log_file_saved; +SET GLOBAL slow_query_log_file = @slow_query_log_file_saved; + +# -- End of Bug#32748. End of 5.1 tests |