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

into neptunus.(none):/home/msvensson/mysql/mysql-4.1 include/my_global.h: Auto merged sql/ha_myisammrg.cc: Auto merged sql/item.cc: Auto merged
2005-05-26 12:10:05 +02:00 · 2005-05-26 12:10:05 +02:00 · 7d7b5dbcae
commit 7d7b5dbcae
parent aa3a934b9d 22944a9563
47 changed files with 52 additions and 47 deletions
--- a/client/sql_string.cc
+++ b/client/sql_string.cc
@ -16,7 +16,7 @@

 /* This file is originally from the mysql distribution. Coded by monty */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/client/sql_string.h
+++ b/client/sql_string.h
@ -16,7 +16,7 @@

 /* This file is originally from the mysql distribution. Coded by monty */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif

--- a/include/my_global.h
+++ b/include/my_global.h
@ -48,6 +48,11 @@
 #define USE_PRAGMA_INTERFACE
 #endif

+/* Determine when to use "#pragma implementation" */
+#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
+#define USE_PRAGMA_IMPLEMENTATION
+#endif
+
 #if defined(i386) && !defined(__i386__)
 #define __i386__
 #endif
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@ -1181,8 +1181,8 @@ start_master()
           $NOT_FIRST_MASTER_EXTRA_OPTS"
  fi

-  CUR_MYERR=$MASTER_MYERR
-  CUR_MYSOCK=$MASTER_MYSOCK
+  CUR_MYERR=$MASTER_MYERR$1
+  CUR_MYSOCK=$MASTER_MYSOCK$1

  # For embedded server we collect the server flags and return
  if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then
--- a/mysys/raid.cc
+++ b/mysys/raid.cc
@ -70,7 +70,7 @@
   tonu@mysql.com & monty@mysql.com
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION 
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/field.cc
+++ b/sql/field.cc
@ -19,7 +19,7 @@
 ** This file implements classes defined in field.h
 *****************************************************************************/

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@ -47,7 +47,7 @@
 */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/ha_blackhole.cc
+++ b/sql/ha_blackhole.cc
@ -15,7 +15,7 @@
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
 #endif

--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@ -28,7 +28,7 @@ have disables the InnoDB inlining in this file. */
    in Windows?
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/ha_isam.cc
+++ b/sql/ha_isam.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation			// gcc: Class implementation
 #endif

--- a/sql/ha_isammrg.cc
+++ b/sql/ha_isammrg.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@ -20,7 +20,7 @@
  NDB Cluster
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation                          // gcc: Class implementation
 #endif

--- a/sql/handler.cc
+++ b/sql/handler.cc
@ -17,7 +17,7 @@

 /* Handler-calling-functions */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/hash_filo.cc
+++ b/sql/hash_filo.cc
@ -20,7 +20,7 @@
 ** to usage.
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item.cc
+++ b/sql/item.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@ -17,7 +17,7 @@

 /* This file defines all compare functions */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@ -17,7 +17,7 @@

 /* This file defines all numerical functions */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@ -17,7 +17,7 @@

 /* This file defines all spatial functions */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@ -20,7 +20,7 @@
 ** (This shouldn't be needed)
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@ -22,7 +22,7 @@ SUBSELECT TODO:
     (sql_select.h/sql_select.cc)
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@ -17,7 +17,7 @@

 /* Sum functions (COUNT, MIN...) */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@ -17,7 +17,7 @@

 /* This file defines all time functions */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/item_uniq.cc
+++ b/sql/item_uniq.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

 /* Compability file */
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif

--- a/sql/item_uniq.h
+++ b/sql/item_uniq.h
@ -16,7 +16,7 @@

 /* Compability file ; This file only contains dummy functions */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface
 #endif

--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@ -16,7 +16,7 @@


 #ifndef MYSQL_CLIENT
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif
 #include  "mysql_priv.h"
--- a/sql/log_event.h
+++ b/sql/log_event.h
@ -22,7 +22,7 @@
 #undef write  // remove pthread.h macro definition, conflict with write() class member
 #endif

-#if defined(__GNUC__) && !defined(MYSQL_CLIENT)
+#if defined(USE_PRAGMA_INTERFACE) && !defined(MYSQL_CLIENT)
 #pragma interface			/* gcc class implementation */
 #endif

--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@ -23,7 +23,7 @@

 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/procedure.cc
+++ b/sql/procedure.cc
@ -17,7 +17,7 @@

 /* Procedures (functions with changes output of select) */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@ -19,7 +19,7 @@
  The actual communction is handled by the net_xxx functions in net_serv.cc
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/protocol_cursor.cc
+++ b/sql/protocol_cursor.cc
@ -19,7 +19,7 @@
  The actual communction is handled by the net_xxx functions in net_serv.cc
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@ -48,7 +48,7 @@
      new attribute.
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@ -23,7 +23,7 @@
 **	 - type set is out of optimization yet
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@ -17,7 +17,7 @@

 /* Analyse database */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface				/* gcc class implementation */
 #endif

--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@ -22,7 +22,7 @@
 **
 *****************************************************************************/

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_crypt.cc
+++ b/sql/sql_crypt.cc
@ -23,7 +23,7 @@
 needs something like 'ssh'.
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_crypt.h
+++ b/sql/sql_crypt.h
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE 
 #pragma interface			/* gcc class implementation */
 #endif

--- a/sql/sql_list.cc
+++ b/sql/sql_list.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_map.cc
+++ b/sql/sql_map.cc
@ -15,7 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_map.h
+++ b/sql/sql_map.h
@ -17,7 +17,7 @@

 /* interface for memory mapped files */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE 
 #pragma interface			/* gcc class implementation */
 #endif

--- a/sql/sql_olap.cc
+++ b/sql/sql_olap.cc
@ -28,7 +28,7 @@

 #ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@ -17,7 +17,7 @@

 /* mysql_select and join optimization */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@ -16,7 +16,7 @@

 /* This file is originally from the mysql distribution. Coded by monty */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif

--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@ -28,7 +28,7 @@
 ** dynamic functions, so this shouldn't be a real problem.
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: implement sql_udf.h
 #endif

--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@ -20,7 +20,7 @@
   (We will refer to this code as to elsie-code further.)
 */

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation				// gcc: Class implementation
 #endif