diff options
| author | istruewing@chilla.local <> | 2007-07-14 19:35:43 +0200 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-07-14 19:35:43 +0200 |
| commit | e307a089a9195b39e5600cdb0a2433a542926bbe (patch) | |
| tree | 28525ad039e59e9c6e03c98f49928a4f24a7fa97 /sql/sql_class.cc | |
| parent | 372856cd72003cf497ee85ccf3ae1806dff078a2 (diff) | |
| parent | eb5398fdd9ce0cfae298dab14a7142861edbf27a (diff) | |
| download | mariadb-git-e307a089a9195b39e5600cdb0a2433a542926bbe.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1-amain
into chilla.local:/home/mydev/mysql-5.1-axmrg
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 4945b805578..61ed471ea8f 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -411,7 +411,7 @@ THD::THD() current_linfo = 0; slave_thread = 0; bzero(&variables, sizeof(variables)); - thread_id= variables.pseudo_thread_id= 0; + thread_id= 0; one_shot_set= 0; file_id = 0; query_id= 0; @@ -571,6 +571,12 @@ void THD::init(void) variables.date_format); variables.datetime_format= date_time_format_copy((THD*) 0, variables.datetime_format); + /* + variables= global_system_variables above has reset + variables.pseudo_thread_id to 0. We need to correct it here to + avoid temporary tables replication failure. + */ + variables.pseudo_thread_id= thread_id; pthread_mutex_unlock(&LOCK_global_system_variables); server_status= SERVER_STATUS_AUTOCOMMIT; if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) |