mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

post-merge fixes.

Browse source 
most tests pass.
5.3 merge is next
This commit is contained in:
Sergei Golubchik 2011-07-02 22:12:12 +02:00
commit b4a0b2c2f8
221 changed files with 2067 additions and 1877 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/scheduler.cc
View file

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