diff options
author | unknown <sasha@mysql.sashanet.com> | 2000-11-27 11:13:05 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2000-11-27 11:13:05 -0700 |
commit | d95ec59726ad44cc26bee2e32c9bffa0052b0a51 (patch) | |
tree | 66e0033b6a729fa25769f98640f7ec7b1bfc719f /sql/sql_class.cc | |
parent | 241e25389f99fa5a536ac3a0bb50d269ec637f07 (diff) | |
parent | 7648e3bc3c3dd27f97b878760938f748499fd378 (diff) | |
download | mariadb-git-d95ec59726ad44cc26bee2e32c9bffa0052b0a51.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 696c111c01a..067e75ceeef 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -98,6 +98,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), start_time=(time_t) 0; current_linfo = 0; slave_thread = 0; + slave_proxy_id = 0; last_nx_table = last_nx_db = 0; inactive_timeout=net_wait_timeout; open_options=ha_open_options; |