a compiler must see '#pragma implementation' *before*

'#pragma interface' (that comes with the #include'd header file)

40 files changed, 71 insertions, 44 deletions

diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index e58996d3c01..10712c2e3be 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -14,8 +14,6 @@
   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>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc
index 2592d307e37..31e4e97c5c7 100644
--- a/sql/examples/ha_example.cc
+++ b/sql/examples/ha_example.cc
@@ -63,8 +63,6 @@
     -Brian
 */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc
index 16e28e5ae85..07e69bfac80 100644
--- a/sql/examples/ha_tina.cc
+++ b/sql/examples/ha_tina.cc
@@ -38,8 +38,6 @@ TODO:
  -Brian
 */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
diff --git a/sql/field.cc b/sql/field.cc
index 292bbe80362..692f123097a 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -19,10 +19,11 @@
 ** This file implements classes defined in field.h
 *****************************************************************************/
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 #include <m_ctype.h>
 #include <errno.h>
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index 35a137df97b..33f7b6238b0 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -47,10 +47,12 @@
 */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
+
 #ifdef HAVE_BERKELEY_DB
 #include <m_ctype.h>
 #include <myisampack.h>
diff --git a/sql/ha_blackhole.cc b/sql/ha_blackhole.cc
index 109098948ac..5b1527aa210 100644
--- a/sql/ha_blackhole.cc
+++ b/sql/ha_blackhole.cc
@@ -15,11 +15,11 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
 #ifdef HAVE_BLACKHOLE_DB
 #include "ha_blackhole.h"
 
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index ad0e8819842..4fc0116a26a 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <myisampack.h>
 #include "ha_heap.h"
 
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 2016f58083a..3f2e11e8bd1 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -28,10 +28,11 @@ have disables the InnoDB inlining in this file. */
     in Windows?
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "slave.h"
 
 #ifdef HAVE_INNOBASE_DB
diff --git a/sql/ha_isam.cc b/sql/ha_isam.cc
index b074edf719d..afa7dffa5f4 100644
--- a/sql/ha_isam.cc
+++ b/sql/ha_isam.cc
@@ -14,10 +14,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #ifdef HAVE_ISAM
 #include <m_ctype.h>
 #include <myisampack.h>
diff --git a/sql/ha_isammrg.cc b/sql/ha_isammrg.cc
index f6fe1a49e9e..c0e6f665f08 100644
--- a/sql/ha_isammrg.cc
+++ b/sql/ha_isammrg.cc
@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #ifdef HAVE_ISAM
 #include <m_ctype.h>
 #ifndef MASTER
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 34e6c429a8f..d8608c6a599 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <myisampack.h>
 #include "ha_myisam.h"
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 1f9e6a71d16..edb3521470f 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include "ha_myisammrg.h"
 #ifndef MASTER
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index d361bec8fcc..a0080af1dfb 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -20,11 +20,12 @@
   NDB Cluster
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 #ifdef HAVE_NDBCLUSTER_DB
 #include <my_dir.h>
 #include "ha_ndbcluster.h"
diff --git a/sql/handler.cc b/sql/handler.cc
index d9db1afff7a..f14564b6629 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -17,10 +17,11 @@
 
 /* Handler-calling-functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "ha_heap.h"
 #include "ha_myisam.h"
 #include "ha_myisammrg.h"
diff --git a/sql/hash_filo.cc b/sql/hash_filo.cc
index a16ff6ac7be..ec200768222 100644
--- a/sql/hash_filo.cc
+++ b/sql/hash_filo.cc
@@ -20,8 +20,9 @@
 ** to usage.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "hash_filo.h"
diff --git a/sql/item.cc b/sql/item.cc
index 96fa1a8fac4..c96794ff482 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -15,10 +15,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include "my_dir.h"
 
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index b17c4a9fbf7..337ac949d35 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -17,10 +17,11 @@
 
 /* This file defines all compare functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include "sql_select.h"
 
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 2d16ef5e183..442ef15bba8 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -17,10 +17,11 @@
 
 /* This file defines all numerical functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "slave.h"				// for wait_for_master_pos
 #include <m_ctype.h>
 #include <hash.h>
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 9dbc1724824..8b856d809d6 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -17,11 +17,11 @@
 
 /* This file defines all spatial functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
 #ifdef HAVE_SPATIAL
 #include <m_ctype.h>
 
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 56b06cb02c4..5ca5caf6bdf 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -20,10 +20,11 @@
 ** (This shouldn't be needed)
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #ifdef HAVE_OPENSSL
 #include <openssl/des.h>
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 9bd9eff5ef7..ebc08545566 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -22,10 +22,11 @@ SUBSELECT TODO:
      (sql_select.h/sql_select.cc)
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 
 inline Item * and_items(Item* cond, Item *item)
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 5c34dc6a603..0e252259f53 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -17,11 +17,12 @@
 
 /* Sum functions (COUNT, MIN...) */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 Item_sum::Item_sum(List<Item> &list)
   :arg_count(list.elements)
 {
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index b7f9236ce46..a3cf69035f3 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -17,10 +17,11 @@
 
 /* This file defines all time functions */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <time.h>
 
diff --git a/sql/item_uniq.cc b/sql/item_uniq.cc
index 8e9653aba88..7701bbbb63e 100644
--- a/sql/item_uniq.cc
+++ b/sql/item_uniq.cc
@@ -16,7 +16,8 @@
 
 /* Compability file */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 866a7c21bb4..a4319f63b83 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -17,10 +17,11 @@
 
 #ifndef MYSQL_CLIENT
 
-#include  "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include  "mysql_priv.h"
 #include "slave.h"
 #include <my_dir.h>
 #endif /* MYSQL_CLIENT */
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 4b6e56468d2..bd1befb436f 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -23,10 +23,11 @@
 
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <nisam.h>
 #include "sql_select.h"
diff --git a/sql/procedure.cc b/sql/procedure.cc
index bd742f645d2..a0042dd879e 100644
--- a/sql/procedure.cc
+++ b/sql/procedure.cc
@@ -17,10 +17,11 @@
 
 /* Procedures (functions with changes output of select) */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "procedure.h"
 #include "sql_analyse.h"			// Includes procedure
 #ifdef USE_PROC_RANGE
diff --git a/sql/protocol.cc b/sql/protocol.cc
index 9a1a05591dd..6a17ae2f95b 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -19,10 +19,11 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <stdarg.h>
 
 static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024;
diff --git a/sql/protocol_cursor.cc b/sql/protocol_cursor.cc
index bb6a0eab2ee..b225e06ed32 100644
--- a/sql/protocol_cursor.cc
+++ b/sql/protocol_cursor.cc
@@ -19,10 +19,11 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <mysql.h>
 
 bool Protocol_cursor::send_fields(List<Item> *list, uint flag)
diff --git a/sql/set_var.cc b/sql/set_var.cc
index b89cdffd4cb..0fa9932dbbc 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -48,10 +48,11 @@
       new attribute.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <mysql.h>
 #include "slave.h"
 #include <my_getopt.h>
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index df66b3c4228..fb5d0eb0a3f 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -23,10 +23,11 @@
 **	 - type set is out of optimization yet
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "procedure.h"
 #include "sql_analyse.h"
 #include <m_ctype.h>
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index fff1e3a3b54..805db107370 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -22,10 +22,11 @@
 **
 *****************************************************************************/
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <m_ctype.h>
 #include <sys/stat.h>
 #include <thr_alarm.h>
diff --git a/sql/sql_crypt.cc b/sql/sql_crypt.cc
index 1cfa0eb8570..f21a109e95d 100644
--- a/sql/sql_crypt.cc
+++ b/sql/sql_crypt.cc
@@ -23,11 +23,12 @@
  needs something like 'ssh'.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 SQL_CRYPT::SQL_CRYPT(const char *password)
 {
   ulong rand_nr[2];
diff --git a/sql/sql_list.cc b/sql/sql_list.cc
index 219ff85946e..d57a7dfe4e3 100644
--- a/sql/sql_list.cc
+++ b/sql/sql_list.cc
@@ -15,11 +15,12 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include "mysql_priv.h"
+
 list_node end_of_list;
 
 void free_list(I_List <i_string_pair> *list)
diff --git a/sql/sql_map.cc b/sql/sql_map.cc
index 408938e7639..aac44949d89 100644
--- a/sql/sql_map.cc
+++ b/sql/sql_map.cc
@@ -15,10 +15,11 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc
index 5631cf9dcef..024abb6c74b 100644
--- a/sql/sql_olap.cc
+++ b/sql/sql_olap.cc
@@ -28,10 +28,11 @@
 
 #ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 38e54ed7104..0424cd8fdbb 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -17,10 +17,11 @@
 
 /* mysql_select and join optimization */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include "sql_select.h"
 
 #include <m_ctype.h>
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 983c2d90a1d..ab2db4aaf53 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -16,10 +16,11 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
-#include <my_global.h>
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
 #include <m_ctype.h>
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 72c92a5c53a..0b84d1b5fb3 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -28,10 +28,11 @@
 ** dynamic functions, so this shouldn't be a real problem.
 */
 
-#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
+
+#include "mysql_priv.h"
 #include <my_pthread.h>
 
 #ifdef HAVE_DLOPEN
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 30ff25f080f..b5ebc9f350a 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -25,12 +25,11 @@
   it creates unsolved link dependencies on some platforms.
 */
 
-#include <my_global.h>
-
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include <my_global.h>
 #if !defined(TZINFO2SQL) && !defined(TESTTIME)
 #include "mysql_priv.h"
 #else