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

address second round review comments

Browse Source
This commit is contained in:
Vladislav Vaintroub
2012-02-16 16:59:04 +01:00
parent 8877fe7359
commit cfa56f900a
8 changed files with 103 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sql/sql_class.cc
View File

@ -1523,7 +1523,7 @@ void THD::awake(killed_state state_to_set)
if (state_to_set >= KILL_CONNECTION || state_to_set == NOT_KILLED)
{
#ifdef SIGNAL_WITH_VIO_CLOSE
if (this != current_thd)
if (this != current_thd)
{
if(active_vio)
vio_shutdown(active_vio, SHUT_RDWR);
@ -3935,10 +3935,16 @@ extern "C" bool thd_sqlcom_can_generate_row_events(const MYSQL_THD thd)
*/
extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type)
{
if(!thd)
thd= current_thd;
if (thd)
MYSQL_CALLBACK(thd->scheduler, thd_wait_begin, (thd, wait_type));
if (unlikely(!thread_scheduler) || !thread_scheduler->thd_wait_begin)
return;
if (thd == NULL)
{
thd=current_thd;
if(unlikely(thd == NULL))
return;
}
MYSQL_CALLBACK(thd->scheduler, thd_wait_begin, (thd, wait_type));
}
/**
@ -3950,10 +3956,16 @@ extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type)
*/
extern "C" void thd_wait_end(MYSQL_THD thd)
{
if(!thd)
thd= current_thd;
if (thd)
MYSQL_CALLBACK(thd->scheduler, thd_wait_end, (thd));
if (unlikely(!thread_scheduler) || ! thread_scheduler->thd_wait_begin)
return;
if (thd == NULL)
{
thd=current_thd;
if(unlikely(thd == NULL))
return;
}
if(likely(thd->scheduler == thread_scheduler))
thread_scheduler->thd_wait_end(thd);
}
#endif // INNODB_COMPATIBILITY_HOOKS */