diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:21:13 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:21:13 -0600 |
| commit | 4f13048e1df88ef50b6f4b28b24f5b216eed0abe (patch) | |
| tree | 093f10b16054d6c98237d7760a1ba0a7e10680ca /sql/sql_class.cc | |
| parent | 9dc099e9e9e65e7f3872b2e141f8424de4fcccbd (diff) | |
| parent | e52e3167c79d874628c47a50d8c8e0210a263085 (diff) | |
| download | mariadb-git-4f13048e1df88ef50b6f4b28b24f5b216eed0abe.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/slave.cc:
Auto merged
sql/sql_class.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 2db08045d89..64fd281ee3a 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -83,6 +83,7 @@ THD::THD() user_time=bootstrap=in_lock_tables=global_read_lock=0; query_length=col_access=0; query_error=0; + server_id = ::server_id; server_status=SERVER_STATUS_AUTOCOMMIT; next_insert_id=last_insert_id=0; open_tables=temporary_tables=0; |