diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-28 20:59:41 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-28 20:59:41 +0200 |
| commit | 24167f94c039d186d5da7cc4ab14c78e5f3c5357 (patch) | |
| tree | d4580e7b848bbd2739c68fbaa7a99b07f9b16d2a /sql/mysql_priv.h | |
| parent | 8b790656f193a5e321462d5727f1b74841d16667 (diff) | |
| parent | b533cd5c83f4a721dba960b97fa94abcad819498 (diff) | |
| download | mariadb-git-24167f94c039d186d5da7cc4ab14c78e5f3c5357.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Use local vrsion
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index fa90ab98022..ae536618e76 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -667,7 +667,7 @@ extern uint delay_key_write_options; extern bool opt_endinfo, using_udf_functions, locked_in_memory; extern bool opt_using_transactions, mysql_embedded; extern bool using_update_log, opt_large_files; -extern bool opt_log, opt_update_log, opt_bin_log, opt_slow_log; +extern bool opt_log, opt_update_log, opt_bin_log, opt_slow_log, opt_error_log; extern bool opt_disable_networking, opt_skip_show_db; extern bool volatile abort_loop, shutdown_in_progress, grant_option; extern uint volatile thread_count, thread_running, global_read_lock; |