Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


sql/item_func.cc:
  Auto merged

client/sql_string.cc

@@ -16,11 +16,12 @@
 
 /* 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>

mysys/raid.cc

@@ -70,6 +70,8 @@
    tonu@mysql.com & monty@mysql.com
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION 
 #pragma implementation				// gcc: Class implementation
 #endif

sql/examples/ha_archive.cc

@@ -14,7 +14,9 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifdef __GNUC__
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 

sql/examples/ha_example.cc

@@ -63,7 +63,9 @@
     -Brian
 */
 
-#ifdef __GNUC__
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 

sql/examples/ha_tina.cc

@@ -38,7 +38,9 @@
  -Brian
 */
 
-#ifdef __GNUC__
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif
 

sql/field.cc

@@ -19,6 +19,8 @@
 ** This file implements classes defined in field.h
 *****************************************************************************/
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/ha_berkeley.cc

@@ -47,6 +47,8 @@
 */
 
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/ha_blackhole.cc

@@ -15,6 +15,8 @@
   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

sql/ha_heap.cc

@@ -15,6 +15,8 @@
    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

sql/ha_innodb.cc

@@ -28,6 +28,8 @@ have disables the InnoDB inlining in this file. */
     in Windows?
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/ha_isam.cc

@@ -15,6 +15,8 @@
    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

sql/ha_isammrg.cc

@@ -15,6 +15,8 @@
    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

sql/ha_myisam.cc

@@ -15,6 +15,8 @@
    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

sql/ha_myisammrg.cc

@@ -15,6 +15,8 @@
    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

sql/ha_ndbcluster.cc

@@ -20,6 +20,8 @@
   NDB Cluster
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation                          // gcc: Class implementation
 #endif

sql/handler.cc

@@ -17,6 +17,8 @@
 
 /* Handler-calling-functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/hash_filo.cc

@@ -20,6 +20,8 @@
 ** to usage.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item.cc

@@ -15,6 +15,8 @@
    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

sql/item_cmpfunc.cc

@@ -17,6 +17,8 @@
 
 /* This file defines all compare functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item_func.cc

@@ -17,6 +17,8 @@
 
 /* This file defines all numerical functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item_geofunc.cc

@@ -17,6 +17,8 @@
 
 /* This file defines all spatial functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item_strfunc.cc

@@ -20,6 +20,8 @@
 ** (This shouldn't be needed)
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item_subselect.cc

@@ -22,6 +22,8 @@ SUBSELECT TODO:
      (sql_select.h/sql_select.cc)
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item_sum.cc

@@ -17,6 +17,8 @@
 
 /* Sum functions (COUNT, MIN...) */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item_timefunc.cc

@@ -17,6 +17,8 @@
 
 /* This file defines all time functions */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/item_uniq.cc

@@ -15,6 +15,9 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Compability file */
+
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif

sql/log_event.cc

@@ -16,6 +16,9 @@
 
 
 #ifndef MYSQL_CLIENT
+
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/opt_range.cc

@@ -23,6 +23,8 @@
 
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/procedure.cc

@@ -17,6 +17,8 @@
 
 /* Procedures (functions with changes output of select) */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/protocol.cc

@@ -19,6 +19,8 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/protocol_cursor.cc

@@ -19,6 +19,8 @@
   The actual communction is handled by the net_xxx functions in net_serv.cc
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/set_var.cc

@@ -48,6 +48,8 @@
       new attribute.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/sql_analyse.cc

@@ -23,6 +23,8 @@
 **	 - type set is out of optimization yet
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/sql_class.cc

@@ -22,6 +22,8 @@
 **
 *****************************************************************************/
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/sql_crypt.cc

@@ -23,6 +23,8 @@
  needs something like 'ssh'.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/sql_list.cc

@@ -15,6 +15,8 @@
    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

sql/sql_map.cc

@@ -15,6 +15,8 @@
    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

sql/sql_olap.cc

@@ -28,6 +28,8 @@
 
 #ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/sql_select.cc

@@ -17,6 +17,8 @@
 
 /* mysql_select and join optimization */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

sql/sql_string.cc

@@ -16,11 +16,12 @@
 
 /* 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>

sql/sql_udf.cc

@@ -28,6 +28,8 @@
 ** dynamic functions, so this shouldn't be a real problem.
 */
 
+#include <my_global.h>
+
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: implement sql_udf.h
 #endif

sql/tztime.cc

@@ -20,18 +20,20 @@
    (We will refer to this code as to elsie-code further.)
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation				// gcc: Class implementation
-#endif
-
 /*
   We should not include mysql_priv.h in mysql_tzinfo_to_sql utility since
   it creates unsolved link dependencies on some platforms.
 */
+
+#include <my_global.h>
+
+#ifdef USE_PRAGMA_IMPLEMENTATION
+#pragma implementation				// gcc: Class implementation
+#endif
+
 #if !defined(TZINFO2SQL) && !defined(TESTTIME)
 #include "mysql_priv.h"
 #else
-#include <my_global.h>
 #include <my_time.h>
 #include "tztime.h"
 #include <my_sys.h>