summaryrefslogtreecommitdiff
path: root/sql/event_scheduler.cc
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2010-04-20 10:51:50 +0200
committerJon Olav Hauglid <jon.hauglid@sun.com>2010-04-20 10:51:50 +0200
commitac7873663866e74fb7572c0b2a5f2548a2897420 (patch)
tree3c10718d95da445db1e1f9405aa01297659a8739 /sql/event_scheduler.cc
parentafdf0f030c342e28c5cfd7220e55830b18424de3 (diff)
parent1a3c03dbb49cfc9ae8246957c5b0ac2a9389d28e (diff)
downloadmariadb-git-ac7873663866e74fb7572c0b2a5f2548a2897420.tar.gz
merge from mysql-trunk-bugfixing
Diffstat (limited to 'sql/event_scheduler.cc')
-rwxr-xr-xsql/event_scheduler.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc
index d189a49d482..33b9a1cafda 100755
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.cc
@@ -13,12 +13,15 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include "mysql_priv.h"
+#include "sql_priv.h"
+#include "unireg.h"
+#include "event_scheduler.h"
#include "events.h"
#include "event_data_objects.h"
-#include "event_scheduler.h"
#include "event_queue.h"
#include "event_db_repository.h"
+#include "sql_connect.h" // init_new_connection_handler_thread
+#include "sql_acl.h" // SUPER_ACL
/**
@addtogroup Event_Scheduler