1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge chilla.local:/home/mydev/mysql-5.0-amain

Browse Source 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
This commit is contained in:
istruewing@chilla.local 2007-07-14 17:51:00 +02:00
commit 23dbf09798
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.cc
View File

@ -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