bk commit into 5.0 tree (kent:1.1916)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.1916 05/06/05 16:20:22 kent@stripped +5 -0
  sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc:
    Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION

  sql/sp_rcontext.cc
    1.27 05/06/05 16:19:13 kent@stripped +1 -1
    Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION

  sql/sp_pcontext.cc
    1.23 05/06/05 16:19:13 kent@stripped +1 -1
    Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION

  sql/sp_head.cc
    1.142 05/06/05 16:19:13 kent@stripped +1 -2
    Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION

  sql/sp_cache.cc
    1.10 05/06/05 16:19:12 kent@stripped +1 -2
    Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION

  sql/ha_federated.cc
    1.28 05/06/05 16:18:48 kent@stripped +2 -3
    Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-5.0

--- 1.27/sql/ha_federated.cc	2005-05-27 22:07:36 +02:00
+++ 1.28/sql/ha_federated.cc	2005-06-05 16:18:48 +02:00
@@ -345,11 +345,10 @@
 
 */
 
-#ifdef __GNUC__
+#include "mysql_priv.h"
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation                          // gcc: Class implementation
 #endif
-
-#include "mysql_priv.h"
 
 #ifdef HAVE_FEDERATED_DB
 #include "ha_federated.h"

--- 1.9/sql/sp_cache.cc	2005-05-27 12:03:33 +02:00
+++ 1.10/sql/sp_cache.cc	2005-06-05 16:19:12 +02:00
@@ -14,11 +14,10 @@
    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
 #endif
-
-#include "mysql_priv.h"
 #include "sp_cache.h"
 #include "sp_head.h"
 

--- 1.141/sql/sp_head.cc	2005-06-01 12:17:38 +02:00
+++ 1.142/sql/sp_head.cc	2005-06-05 16:19:13 +02:00
@@ -14,11 +14,10 @@
    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
 #endif
-
-#include "mysql_priv.h"
 #include "sp_head.h"
 #include "sp.h"
 #include "sp_pcontext.h"

--- 1.22/sql/sp_pcontext.cc	2005-05-27 12:03:33 +02:00
+++ 1.23/sql/sp_pcontext.cc	2005-06-05 16:19:13 +02:00
@@ -14,6 +14,7 @@
    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
 #endif
@@ -22,7 +23,6 @@
 #undef SAFEMALLOC				/* Problems with threads */
 #endif
 
-#include "mysql_priv.h"
 #include "sp_pcontext.h"
 #include "sp_head.h"
 

--- 1.26/sql/sp_rcontext.cc	2005-05-27 12:03:33 +02:00
+++ 1.27/sql/sp_rcontext.cc	2005-06-05 16:19:13 +02:00
@@ -14,6 +14,7 @@
    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
 #endif
@@ -22,7 +23,6 @@
 #undef SAFEMALLOC				/* Problems with threads */
 #endif
 
-#include "mysql_priv.h"
 #include "mysql.h"
 #include "sp_head.h"
 #include "sp_rcontext.h"