database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

LP909537: Ensure thd_wait_begin/thd_wait_end callbacks are called.

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-12-29 19:37:26 +01:00
parent 8d90582a3b
commit 539a7ebe10
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/sql_class.cc
View File

@@ -3927,9 +3927,7 @@ extern "C" bool thd_sqlcom_can_generate_row_events(const MYSQL_THD thd)
return sqlcom_can_generate_row_events(thd);
}
#ifdef NOT_USED /* we'll do the correctly instead */
extern "C" void thd_pool_wait_begin(MYSQL_THD thd, int wait_type);
extern "C" void thd_pool_wait_end(MYSQL_THD thd);
/*
Interface for MySQL Server, plugins and storage engines to report
@@ -3954,7 +3952,10 @@ extern "C" void thd_pool_wait_end(MYSQL_THD thd);
*/
extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type)
{
MYSQL_CALLBACK(thd->scheduler, thd_wait_begin, (thd, wait_type));
if(!thd)
thd= current_thd;
if (thd)
MYSQL_CALLBACK(thd->scheduler, thd_wait_begin, (thd, wait_type));
}
/**
@@ -3965,21 +3966,12 @@ extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type)
*/
extern "C" void thd_wait_end(MYSQL_THD thd)
{
MYSQL_CALLBACK(thd->scheduler, thd_wait_end, (thd));
}
#else
extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type)
{
/* do NOTHING for the embedded library */
return;
if(!thd)
thd= current_thd;
if (thd)
MYSQL_CALLBACK(thd->scheduler, thd_wait_end, (thd));
}
extern "C" void thd_wait_end(MYSQL_THD thd)
{
/* do NOTHING for the embedded library */
return;
}
#endif
#endif // INNODB_COMPATIBILITY_HOOKS */
/****************************************************************************