Commit bb233cb3 authored by dlenev@mockturtle.local's avatar dlenev@mockturtle.local

Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
parents d9d887ad e4f88d52
...@@ -1804,6 +1804,12 @@ static bool cache_thread() ...@@ -1804,6 +1804,12 @@ static bool cache_thread()
thd= thread_cache.get(); thd= thread_cache.get();
thd->thread_stack= (char*) &thd; // For store_globals thd->thread_stack= (char*) &thd; // For store_globals
(void) thd->store_globals(); (void) thd->store_globals();
/*
THD::mysys_var::abort is associated with physical thread rather
than with THD object. So we need to reset this flag before using
this thread for handling of new THD object/connection.
*/
thd->mysys_var->abort= 0;
thd->thr_create_time= time(NULL); thd->thr_create_time= time(NULL);
threads.append(thd); threads.append(thd);
return(1); return(1);
......
...@@ -1127,6 +1127,7 @@ sp_head::execute(THD *thd) ...@@ -1127,6 +1127,7 @@ sp_head::execute(THD *thd)
thd->clear_error(); thd->clear_error();
thd->is_fatal_error= 0; thd->is_fatal_error= 0;
thd->killed= THD::NOT_KILLED; thd->killed= THD::NOT_KILLED;
thd->mysys_var->abort= 0;
continue; continue;
} }
} }
......
...@@ -689,7 +689,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -689,7 +689,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
DBUG_ENTER("dispatch_command"); DBUG_ENTER("dispatch_command");
if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA) if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
{
thd->killed= THD::NOT_KILLED; thd->killed= THD::NOT_KILLED;
thd->mysys_var->abort= 0;
}
thd->command=command; thd->command=command;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment