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.cc | |
| 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.cc')
| -rw-r--r-- | sql/scheduler.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/scheduler.cc b/sql/scheduler.cc index b1083083c38..df1fc68dddc 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -21,13 +21,11 @@ #pragma implementation #endif -#include <sql_priv.h> -#include "unireg.h" // REQUIRED: for other includes -#include "scheduler.h" #include "sql_connect.h" // init_new_connection_handler_thread #include "scheduler.h" +#include "mysqld.h" +#include "sql_class.h" #include "sql_callback.h" -#include "sql_audit.h" /* End connection, in case when we are using 'no-threads' @@ -51,7 +49,7 @@ extern "C" static void scheduler_wait_lock_begin(void) { THD *thd=current_thd; scheduler_functions *func= thd->scheduler; - MYSQL_CALLBACK(func, thd_wait_begin, (thd, THD_WAIT_ROW_TABLE_LOCK)); + MYSQL_CALLBACK(func, thd_wait_begin, (thd, THD_WAIT_TABLE_LOCK)); } static void scheduler_wait_lock_end(void) { |