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

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

Browse Source 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
This commit is contained in:
dlenev@mockturtle.local
2007-03-15 11:55:15 +03:00
parent d9d887ad6d e4f88d5215
commit bb233cb349
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysqld.cc
View File

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

1
sql/sp_head.cc
View File

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

3
sql/sql_parse.cc
View File

@ -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;
/* /*