diff options
| author | unknown <kostja@bodhi.(none)> | 2008-05-20 22:23:58 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2008-05-20 22:23:58 +0400 |
| commit | 7ce32c91ba07d9b53cacbca2beb6d64064624aaf (patch) | |
| tree | 0f75f883ab5808644d7a7168b23652864e1a27d4 /mysql-test/t/general_log_file_basic.test | |
| parent | 3587539f2228aea4e40c695c60cc079ba86064c8 (diff) | |
| download | mariadb-git-7ce32c91ba07d9b53cacbca2beb6d64064624aaf.tar.gz | |
A number of fixes after a merge from the main 5.1 tree:
the local tree contains a fix for
Bug#32748 "Inconsistent handling of assignments to
general_log_file/slow_query_log_file",
which changes output of a number of tests.
mysql-test/r/general_log_file_basic.result:
Update results (Bug#32748)
mysql-test/r/log_output_basic.result:
Update the test with results of the fix for Bug#32748
mysql-test/r/slow_query_log_file_basic.result:
Update the test with results of the fix for Bug#32748
mysql-test/t/general_log_file_basic.test:
Adjust to take into account the fix for Bug#32748
(a port from 6.0-bugteam)
mysql-test/t/log_output_basic.test:
Adjust to take into account the fix for Bug#32748
(a port from 6.0-bugteam)
mysql-test/t/slow_query_log_file_basic.test:
Adjust to take into account the fix for Bug#32748
(a port from 6.0-bugteam)
tests/mysql_client_test.c:
Fix a compilation warning.
Diffstat (limited to 'mysql-test/t/general_log_file_basic.test')
| -rw-r--r-- | mysql-test/t/general_log_file_basic.test | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/t/general_log_file_basic.test b/mysql-test/t/general_log_file_basic.test index 50fe89fd0ce..639e6619ef9 100644 --- a/mysql-test/t/general_log_file_basic.test +++ b/mysql-test/t/general_log_file_basic.test @@ -52,8 +52,11 @@ SELECT RIGHT(@@global.general_log_file,10) AS log_file; # 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------------------------#' ############################################################################## |