diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /sql/scheduler.h | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'sql/scheduler.h')
| -rw-r--r-- | sql/scheduler.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/scheduler.h b/sql/scheduler.h index 247c98515ac..7c9cafd8a71 100644 --- a/sql/scheduler.h +++ b/sql/scheduler.h @@ -24,6 +24,8 @@ #pragma interface #endif +#include <my_global.h> + class THD; /* Functions used when manipulating threads */ @@ -119,11 +121,4 @@ class thd_scheduler #endif -void *thd_get_scheduler_data(THD *thd); -void thd_set_scheduler_data(THD *thd, void *data); -PSI_thread* thd_get_psi(THD *thd); -void thd_set_psi(THD *thd, PSI_thread *psi); - -extern scheduler_functions *thread_scheduler; - #endif |