diff options
author | unknown <svoj@mysql.com/april.(none)> | 2007-07-14 17:58:39 +0500 |
---|---|---|
committer | unknown <svoj@mysql.com/april.(none)> | 2007-07-14 17:58:39 +0500 |
commit | a9c6a0bbbc3f56e859848f2f4ac21412995dde2c (patch) | |
tree | 085e44a28990f0b0ca00fa873ba28b00759643e5 /sql/sql_class.cc | |
parent | 15a9301a2943adc83ee980c3616e963644abdcf4 (diff) | |
download | mariadb-git-a9c6a0bbbc3f56e859848f2f4ac21412995dde2c.tar.gz |
BUG#29734 - thread_id=0 in binary log which leads to temporary table conflicts
pseudo_thread_id was reset to zero via mysql_change_user() handling
whereas there is no reason to do that. Moreover, having two
concurrent threads that change user and create a namesake temp tables
leads to recording the dup pair of queries:
set @@session.pseudo_thread_id = 0;
CREATE temporary table `the namesake`;
which will stall the slave as the second instance can not be created.
And that is the bug case.
Fixed by correcting pseudo_thread_id value after mysql_change_user().
sql/sql_class.cc:
Fixed that pseudo_thread_id was set to 0 after mysql_change_user().
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 036ba217a9b..ee4e1ea149c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -211,7 +211,7 @@ THD::THD() time_after_lock=(time_t) 0; current_linfo = 0; slave_thread = 0; - variables.pseudo_thread_id= 0; + thread_id= 0; one_shot_set= 0; file_id = 0; query_id= 0; @@ -328,6 +328,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) @@ -579,6 +585,9 @@ bool THD::store_globals() By default 'slave_proxy_id' is 'thread_id'. They may later become different if this is the slave SQL thread. */ + /** @todo we already do it in init(), see if we still need to do it here. + add DBUG_ASSERT(variables.pseudo_thread_id == thread_id) + */ variables.pseudo_thread_id= thread_id; /* We have to call thr_lock_info_init() again here as THD may have been |