diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-04-13 09:07:46 +0300 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-04-13 09:07:46 +0300 |
| commit | 830803a23b017530a76f176d635d83c1adc588e8 (patch) | |
| tree | e1b7e490cac91f8dd9cc767b572ba4b6268946fe /sql/set_var.cc | |
| parent | f3efb3dcfac96afa487709f2603784f60f021f61 (diff) | |
| parent | 2e73a53e033741b09a652646d9cfa0e76c33e6a1 (diff) | |
| download | mariadb-git-830803a23b017530a76f176d635d83c1adc588e8.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index ec74ce45b6b..161b857ca98 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -877,7 +877,7 @@ SHOW_VAR init_vars[]= { #ifdef HAVE_REPLICATION {"log_slave_updates", (char*) &opt_log_slave_updates, SHOW_MY_BOOL}, #endif - {"log_slow_queries", (char*) &opt_slow_log, SHOW_BOOL}, + {"log_slow_queries", (char*) &opt_slow_log, SHOW_MY_BOOL}, {sys_log_warnings.name, (char*) &sys_log_warnings, SHOW_SYS}, {sys_long_query_time.name, (char*) &sys_long_query_time, SHOW_SYS}, {sys_low_priority_updates.name, (char*) &sys_low_priority_updates, SHOW_SYS}, |