From b4a0b2c2f862ab0de853dc34e1e56f6159043e45 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Sat, 2 Jul 2011 22:12:12 +0200
Subject: post-merge fixes. most tests pass. 5.3 merge is next

---
 sql/scheduler.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'sql/scheduler.h')

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
-- 
cgit v1.2.1