diff options
| author | unknown <jimw@mysql.com> | 2006-05-19 16:17:24 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-19 16:17:24 -0700 |
| commit | 719bfafc2f1086d5a2eaf9c91b386d4efd41f1a7 (patch) | |
| tree | 7c33cbe46adf4c8f526f3f2de68fb9c3701071d3 /sql/mysqld.cc | |
| parent | 8dff422f0bf901c0d8cc8f975df635df0fe03762 (diff) | |
| parent | c06972bf2a9e9739c0eb926c6f750b8990fd4c17 (diff) | |
| download | mariadb-git-719bfafc2f1086d5a2eaf9c91b386d4efd41f1a7.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-1039
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
include/sslopt-longopts.h:
Resolve conflict
include/sslopt-vars.h:
Resolve conflict
mysql-test/r/variables.result:
Resolve conflict
mysql-test/t/variables.test:
Resolve conflict
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ee4fcb82e97..50f19c15fc4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -311,7 +311,6 @@ static bool volatile ready_to_exit; static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0; static my_bool opt_bdb, opt_isam, opt_ndbcluster; static my_bool opt_short_log_format= 0; -static my_bool opt_log_queries_not_using_indexes= 0; static uint kill_cached_threads, wake_thread; static ulong killed_threads, thread_created; static ulong max_used_connections; @@ -337,6 +336,7 @@ static my_bool opt_sync_bdb_logs; /* Global variables */ bool opt_log, opt_update_log, opt_bin_log, opt_slow_log; +my_bool opt_log_queries_not_using_indexes= 0; bool opt_error_log= IF_WIN(1,0); bool opt_disable_networking=0, opt_skip_show_db=0; my_bool opt_character_set_client_handshake= 1; @@ -603,6 +603,7 @@ my_bool opt_enable_shared_memory; HANDLE smem_event_connect_request= 0; #endif +#define SSL_VARS_NOT_STATIC #include "sslopt-vars.h" #ifdef HAVE_OPENSSL #include <openssl/crypto.h> |