database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
This commit is contained in:
istruewing@chilla.local
2007-07-14 19:35:43 +02:00
parent 372856cd72 eb5398fdd9
commit e307a089a9
14 changed files with 271 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.cc
View File

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