diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-24 23:01:05 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-24 23:01:05 +0400 |
| commit | 8ed01f838ed3f6b7b028576d2bc32a7f0e25483c (patch) | |
| tree | 0014e272f814bc36c9cc07e4d8780e32a3f362a1 /mysql-test | |
| parent | 2a7d20308f3b642d13040dda3227404a34a7ab39 (diff) | |
| parent | 20b9d9bb2ffec3eb2490047b4c9e4b6502342904 (diff) | |
| download | mariadb-git-8ed01f838ed3f6b7b028576d2bc32a7f0e25483c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/log_state.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result index 946797aeec7..38b3ebd6e98 100644 --- a/mysql-test/r/log_state.result +++ b/mysql-test/r/log_state.result @@ -131,7 +131,7 @@ set global general_log=ON; set global log_output=default; show variables like 'log_output'; Variable_name Value -log_output TABLE +log_output FILE set global general_log=OFF; set global log_output=FILE; truncate table mysql.general_log; |