diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-15 16:15:20 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-15 16:15:20 -0600 |
| commit | 12d4a5efe938688ef935818d22880137c95c2bfc (patch) | |
| tree | d9605512661b2cf16650f97c4d97ee5edf58f8e2 /sql/mysqld.cc | |
| parent | abb2aaa2792183168b11479a9b99d5d700667e1e (diff) | |
| parent | 051f082b37199edf1345ce32add39076560d5e85 (diff) | |
| download | mariadb-git-12d4a5efe938688ef935818d22880137c95c2bfc.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index cf0a61d3606..4e50ac2e8cf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -262,7 +262,7 @@ bool server_id_supplied = 0; uint mysql_port; uint test_flags = 0, select_errors=0, dropping_tables=0,ha_open_options=0; uint volatile thread_count=0, thread_running=0, kill_cached_threads=0, - wake_thread=0, global_read_lock=0; + wake_thread=0; ulong thd_startup_options=(OPTION_UPDATE_LOG | OPTION_AUTO_IS_NULL | OPTION_BIN_LOG | OPTION_QUOTE_SHOW_CREATE ); uint protocol_version=PROTOCOL_VERSION; |