fix compilation failure on serg's box: we shouldn't

use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined


server-tools/instance-manager/command.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/listener.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/mysql_connection.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/options.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/thread_registry.cc:
  fix register
server-tools/instance-manager/thread_registry.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/user_map.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined

7 files changed, 20 insertions, 21 deletions

diff --git a/server-tools/instance-manager/command.h b/server-tools/instance-manager/command.h
index 82ded800e65..b84cc6a8e9e 100644
--- a/server-tools/instance-manager/command.h
+++ b/server-tools/instance-manager/command.h
@@ -16,12 +16,12 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_global.h>
+
 #if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
 #pragma interface
 #endif
 
-#include <my_global.h>
-
 /* Class responsible for allocation of im commands. */
 
 class Instance_map;
diff --git a/server-tools/instance-manager/listener.h b/server-tools/instance-manager/listener.h
index e0ab5b8ef2b..28ccbf91731 100644
--- a/server-tools/instance-manager/listener.h
+++ b/server-tools/instance-manager/listener.h
@@ -16,13 +16,13 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_global.h>
+#include <my_pthread.h>
+
 #if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
 #pragma interface
 #endif
 
-#include <my_global.h>
-#include <my_pthread.h>
-
 
 pthread_handler_t listener(void *arg);
 
diff --git a/server-tools/instance-manager/mysql_connection.h b/server-tools/instance-manager/mysql_connection.h
index 492937b2198..3496cc05815 100644
--- a/server-tools/instance-manager/mysql_connection.h
+++ b/server-tools/instance-manager/mysql_connection.h
@@ -16,13 +16,12 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
-#pragma interface
-#endif
-
 #include <my_global.h>
 #include <my_pthread.h>
 
+#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
+#pragma interface
+#endif
 
 pthread_handler_t mysql_connection(void *arg);
 
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h
index 3a60de2bb39..6d719c69629 100644
--- a/server-tools/instance-manager/options.h
+++ b/server-tools/instance-manager/options.h
@@ -16,16 +16,16 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
-#pragma interface
-#endif
-
 /*
   Options - all possible options for the instance manager grouped in one
   struct.
 */
 #include <my_global.h>
 
+#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
+#pragma interface
+#endif
+
 struct Options
 {
 #ifdef __WIN__
diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc
index 1578ba3e9b2..0091d713a91 100644
--- a/server-tools/instance-manager/thread_registry.cc
+++ b/server-tools/instance-manager/thread_registry.cc
@@ -1,4 +1,4 @@
-/* cOPYRIght (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/server-tools/instance-manager/thread_registry.h b/server-tools/instance-manager/thread_registry.h
index 6a9e2e115d4..6dc320a8533 100644
--- a/server-tools/instance-manager/thread_registry.h
+++ b/server-tools/instance-manager/thread_registry.h
@@ -50,13 +50,12 @@
   in manner, similar to ``quit'' signals.
 */
 
-#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
-#pragma interface
-#endif
-
 #include <my_global.h>
 #include <my_pthread.h>
 
+#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
+#pragma interface
+#endif
 
 /*
   Thread_info - repository entry for each worker thread
diff --git a/server-tools/instance-manager/user_map.h b/server-tools/instance-manager/user_map.h
index a57174a37c3..4134017dd9b 100644
--- a/server-tools/instance-manager/user_map.h
+++ b/server-tools/instance-manager/user_map.h
@@ -16,15 +16,16 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
-#pragma interface
-#endif
 
 #include <my_global.h>
 
 #include <my_sys.h>
 #include <hash.h>
 
+#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
+#pragma interface
+#endif
+
 /*
   User_map -- all users and passwords
 */