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

Merge mysql.com:/home/svoj/devel/mysql/BUG29734/mysql-5.0-engines

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/BUG29734/mysql-5.1-engines


sql/sql_class.cc:
  Manual merge.
This commit is contained in:
unknown 2007-07-14 18:09:48 +05:00
commit 32638825f3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.cc
View File

@ -381,7 +381,7 @@ THD::THD()
current_linfo = 0; current_linfo = 0;
slave_thread = 0; slave_thread = 0;
bzero(&variables, sizeof(variables)); bzero(&variables, sizeof(variables));
thread_id= variables.pseudo_thread_id= 0; thread_id= 0;
one_shot_set= 0; one_shot_set= 0;
file_id = 0; file_id = 0;
query_id= 0; query_id= 0;
@ -498,6 +498,12 @@ void THD::init(void)
variables.date_format); variables.date_format);
variables.datetime_format= date_time_format_copy((THD*) 0, variables.datetime_format= date_time_format_copy((THD*) 0,
variables.datetime_format); 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); pthread_mutex_unlock(&LOCK_global_system_variables);
server_status= SERVER_STATUS_AUTOCOMMIT; server_status= SERVER_STATUS_AUTOCOMMIT;
if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)