Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2314 05/06/05 19:38:52 serg@stripped +44 -0
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/tztime.cc
1.20 05/06/05 19:38:42 serg@stripped +1 -2
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_udf.cc
1.49 05/06/05 19:38:42 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_string.cc
1.93 05/06/05 19:38:42 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_select.cc
1.407 05/06/05 19:38:42 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_olap.cc
1.16 05/06/05 19:38:42 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_map.cc
1.8 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_list.cc
1.10 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_crypt.cc
1.10 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_class.cc
1.199 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/sql_analyse.cc
1.52 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/set_var.cc
1.169 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/protocol_cursor.cc
1.7 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/protocol.cc
1.104 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/procedure.cc
1.9 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/opt_range.cc
1.138 05/06/05 19:38:41 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/log_event.cc
1.181 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_uniq.cc
1.9 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_timefunc.cc
1.89 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_sum.cc
1.139 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_subselect.cc
1.136 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_strfunc.cc
1.226 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_geofunc.cc
1.23 05/06/05 19:38:40 serg@stripped +1 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_func.cc
1.251 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item_cmpfunc.cc
1.189 05/06/05 19:38:40 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/item.cc
1.208 05/06/05 19:38:39 serg@stripped +1 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/hash_filo.cc
1.8 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/handler.cc
1.167 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_ndbcluster.cc
1.156 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_myisammrg.cc
1.62 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_myisam.cc
1.159 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_isammrg.cc
1.20 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_isam.cc
1.34 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_innodb.cc
1.201 05/06/05 19:38:39 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_heap.cc
1.56 05/06/05 19:38:38 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_blackhole.cc
1.8 05/06/05 19:38:38 serg@stripped +1 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/ha_berkeley.cc
1.152 05/06/05 19:38:38 serg@stripped +3 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/field.cc
1.220 05/06/05 19:38:38 serg@stripped +2 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/examples/ha_tina.cc
1.6 05/06/05 19:38:38 serg@stripped +0 -2
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/examples/ha_example.cc
1.11 05/06/05 19:38:38 serg@stripped +0 -2
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
sql/examples/ha_archive.cc
1.25 05/06/05 19:38:38 serg@stripped +0 -2
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
mysys/raid.cc
1.34 05/06/05 19:38:38 serg@stripped +0 -2
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
include/my_global.h
1.93 05/06/05 19:38:38 serg@stripped +2 -7
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
configure.in
1.378 05/06/05 19:38:37 serg@stripped +12 -1
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
client/sql_string.cc
1.23 05/06/05 19:38:37 serg@stripped +1 -2
a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: serg
# Host: serg.mylan
# Root: /usr/home/serg/Abk/mysql-4.1
--- 1.22/client/sql_string.cc Thu Jun 2 02:23:48 2005
+++ 1.23/client/sql_string.cc Sun Jun 5 19:38:37 2005
@@ -16,12 +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>
--- 1.377/configure.in Fri Jun 3 21:10:17 2005
+++ 1.378/configure.in Sun Jun 5 19:38:37 2005
@@ -1837,12 +1837,23 @@ if test "$ac_cv_sizeof_off_t" -eq 0
then
AC_MSG_ERROR("MySQL needs a off_t type.")
fi
+
+# do we need #pragma interface/#pragma implementation ?
+# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
+AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)
+# instead of trying to match SYSTEM_TYPE and CC_VERSION (that doesn't
+# follow any standard), we'll use well-defined preprocessor macros:
+AC_TRY_CPP([
+#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
+#error USE_PRAGMA_IMPLEMENTATION
+#endif
+],AC_MSG_RESULT(no) ,AC_MSG_RESULT(yes) ; CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION")
+
# This always gives a warning. Ignore it unless you are cross compiling
AC_C_BIGENDIAN
#---START: Used in for client configure
# Check base type of last arg to accept
MYSQL_TYPE_ACCEPT
-
#---END:
# Figure out what type of struct rlimit to use with setrlimit
MYSQL_TYPE_STRUCT_RLIMIT
--- 1.33/mysys/raid.cc Thu Jun 2 02:23:48 2005
+++ 1.34/mysys/raid.cc Sun Jun 5 19:38:38 2005
@@ -70,8 +70,6 @@
tonu@stripped & monty@stripped
*/
-#include <my_global.h>
-
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif
--- 1.219/sql/field.cc Fri Jun 3 22:45:55 2005
+++ 1.220/sql/field.cc Sun Jun 5 19:38:38 2005
@@ -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>
--- 1.151/sql/ha_berkeley.cc Fri Jun 3 22:45:55 2005
+++ 1.152/sql/ha_berkeley.cc Sun Jun 5 19:38:38 2005
@@ -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>
--- 1.55/sql/ha_heap.cc Fri Jun 3 22:45:56 2005
+++ 1.56/sql/ha_heap.cc Sun Jun 5 19:38:38 2005
@@ -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"
--- 1.33/sql/ha_isam.cc Fri Jun 3 22:45:56 2005
+++ 1.34/sql/ha_isam.cc Sun Jun 5 19:38:39 2005
@@ -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>
--- 1.19/sql/ha_isammrg.cc Fri Jun 3 22:45:56 2005
+++ 1.20/sql/ha_isammrg.cc Sun Jun 5 19:38:39 2005
@@ -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
--- 1.158/sql/ha_myisam.cc Fri Jun 3 22:45:56 2005
+++ 1.159/sql/ha_myisam.cc Sun Jun 5 19:38:39 2005
@@ -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"
--- 1.61/sql/ha_myisammrg.cc Fri Jun 3 22:45:56 2005
+++ 1.62/sql/ha_myisammrg.cc Sun Jun 5 19:38:39 2005
@@ -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
--- 1.166/sql/handler.cc Fri Jun 3 22:45:56 2005
+++ 1.167/sql/handler.cc Sun Jun 5 19:38:39 2005
@@ -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"
--- 1.7/sql/hash_filo.cc Fri Jun 3 22:45:56 2005
+++ 1.8/sql/hash_filo.cc Sun Jun 5 19:38:39 2005
@@ -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"
--- 1.207/sql/item.cc Fri Jun 3 22:45:56 2005
+++ 1.208/sql/item.cc Sun Jun 5 19:38:39 2005
@@ -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"
--- 1.188/sql/item_cmpfunc.cc Fri Jun 3 22:45:56 2005
+++ 1.189/sql/item_cmpfunc.cc Sun Jun 5 19:38:40 2005
@@ -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"
--- 1.250/sql/item_func.cc Fri Jun 3 22:45:56 2005
+++ 1.251/sql/item_func.cc Sun Jun 5 19:38:40 2005
@@ -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>
--- 1.225/sql/item_strfunc.cc Fri Jun 3 22:45:56 2005
+++ 1.226/sql/item_strfunc.cc Sun Jun 5 19:38:40 2005
@@ -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>
--- 1.138/sql/item_sum.cc Fri Jun 3 22:45:56 2005
+++ 1.139/sql/item_sum.cc Sun Jun 5 19:38:40 2005
@@ -17,10 +17,11 @@
/* 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)
--- 1.88/sql/item_timefunc.cc Fri Jun 3 22:45:57 2005
+++ 1.89/sql/item_timefunc.cc Sun Jun 5 19:38:40 2005
@@ -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>
--- 1.8/sql/item_uniq.cc Fri Jun 3 22:45:57 2005
+++ 1.9/sql/item_uniq.cc Sun Jun 5 19:38:40 2005
@@ -16,7 +16,8 @@
/* Compability file */
-#include "mysql_priv.h"
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif
+
+#include "mysql_priv.h"
--- 1.180/sql/log_event.cc Fri Jun 3 22:45:57 2005
+++ 1.181/sql/log_event.cc Sun Jun 5 19:38:40 2005
@@ -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 */
--- 1.103/sql/protocol.cc Fri Jun 3 22:45:57 2005
+++ 1.104/sql/protocol.cc Sun Jun 5 19:38:41 2005
@@ -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;
--- 1.137/sql/opt_range.cc Fri Jun 3 22:45:57 2005
+++ 1.138/sql/opt_range.cc Sun Jun 5 19:38:41 2005
@@ -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"
--- 1.8/sql/procedure.cc Fri Jun 3 22:45:57 2005
+++ 1.9/sql/procedure.cc Sun Jun 5 19:38:41 2005
@@ -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
--- 1.51/sql/sql_analyse.cc Fri Jun 3 22:45:57 2005
+++ 1.52/sql/sql_analyse.cc Sun Jun 5 19:38:41 2005
@@ -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>
--- 1.198/sql/sql_class.cc Fri Jun 3 22:45:57 2005
+++ 1.199/sql/sql_class.cc Sun Jun 5 19:38:41 2005
@@ -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>
--- 1.9/sql/sql_crypt.cc Fri Jun 3 22:45:57 2005
+++ 1.10/sql/sql_crypt.cc Sun Jun 5 19:38:41 2005
@@ -23,10 +23,11 @@
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)
{
--- 1.9/sql/sql_list.cc Fri Jun 3 22:45:57 2005
+++ 1.10/sql/sql_list.cc Sun Jun 5 19:38:41 2005
@@ -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"
list_node end_of_list;
--- 1.7/sql/sql_map.cc Fri Jun 3 22:45:57 2005
+++ 1.8/sql/sql_map.cc Sun Jun 5 19:38:41 2005
@@ -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>
--- 1.406/sql/sql_select.cc Fri Jun 3 22:45:58 2005
+++ 1.407/sql/sql_select.cc Sun Jun 5 19:38:42 2005
@@ -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>
--- 1.92/sql/sql_string.cc Fri Jun 3 22:45:58 2005
+++ 1.93/sql/sql_string.cc Sun Jun 5 19:38:42 2005
@@ -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>
--- 1.48/sql/sql_udf.cc Fri Jun 3 22:45:58 2005
+++ 1.49/sql/sql_udf.cc Sun Jun 5 19:38:42 2005
@@ -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
--- 1.15/sql/sql_olap.cc Fri Jun 3 22:45:57 2005
+++ 1.16/sql/sql_olap.cc Sun Jun 5 19:38:42 2005
@@ -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"
--- 1.135/sql/item_subselect.cc Fri Jun 3 22:45:56 2005
+++ 1.136/sql/item_subselect.cc Sun Jun 5 19:38:40 2005
@@ -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)
--- 1.24/sql/examples/ha_archive.cc Thu Jun 2 03:44:53 2005
+++ 1.25/sql/examples/ha_archive.cc Sun Jun 5 19:38:38 2005
@@ -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
--- 1.5/sql/examples/ha_tina.cc Thu Jun 2 03:44:53 2005
+++ 1.6/sql/examples/ha_tina.cc Sun Jun 5 19:38:38 2005
@@ -38,8 +38,6 @@ TODO:
-Brian
*/
-#include <my_global.h>
-
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif
--- 1.10/sql/examples/ha_example.cc Thu Jun 2 03:44:53 2005
+++ 1.11/sql/examples/ha_example.cc Sun Jun 5 19:38:38 2005
@@ -63,8 +63,6 @@
-Brian
*/
-#include <my_global.h>
-
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#endif
--- 1.7/sql/ha_blackhole.cc Fri Jun 3 22:45:56 2005
+++ 1.8/sql/ha_blackhole.cc Sun Jun 5 19:38:38 2005
@@ -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"
--- 1.19/sql/tztime.cc Thu Jun 2 02:40:48 2005
+++ 1.20/sql/tztime.cc Sun Jun 5 19:38:42 2005
@@ -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
--- 1.6/sql/protocol_cursor.cc Fri Jun 3 22:45:57 2005
+++ 1.7/sql/protocol_cursor.cc Sun Jun 5 19:38:41 2005
@@ -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)
--- 1.155/sql/ha_ndbcluster.cc Fri Jun 3 22:45:56 2005
+++ 1.156/sql/ha_ndbcluster.cc Sun Jun 5 19:38:39 2005
@@ -20,10 +20,11 @@
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>
--- 1.200/sql/ha_innodb.cc Fri Jun 3 22:45:56 2005
+++ 1.201/sql/ha_innodb.cc Sun Jun 5 19:38:39 2005
@@ -28,10 +28,11 @@ have disables the InnoDB inlining in thi
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
--- 1.92/include/my_global.h Fri Jun 3 18:29:29 2005
+++ 1.93/include/my_global.h Sun Jun 5 19:38:38 2005
@@ -43,14 +43,9 @@
#define HAVE_ERRNO_AS_DEFINE
#endif /* __CYGWIN__ */
-/* Determine when to use "#pragma interface" */
-#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
+/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
+#ifdef USE_PRAGMA_IMPLEMENTATION
#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__)
--- 1.168/sql/set_var.cc Fri Jun 3 22:45:57 2005
+++ 1.169/sql/set_var.cc Sun Jun 5 19:38:41 2005
@@ -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>
--- 1.22/sql/item_geofunc.cc Fri Jun 3 22:45:56 2005
+++ 1.23/sql/item_geofunc.cc Sun Jun 5 19:38:40 2005
@@ -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>
| Thread |
|---|
| • bk commit into 4.1 tree (serg:1.2314) | Sergei Golubchik | 5 Jun |
