bk commit into 5.2 tree (rafal:1.2551)

[rsomla]

Below is the list of changes that have just been committed into a local
5.2 repository of rafal. When rafal 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@stripped, 2007-06-30 11:18:25+02:00, rafal@quant.(none) +2 -0
  WL#3327: Fixing problem with build on powermac.
  
  To correctly compile code on powermac platfrom, interface and implementation
  #pragma-s are needed in archive.{h,cc}. Apparently, they have effect only
  if placed at the beginning of a file. This patch moves them to that position.

  sql/backup/archive.cc@stripped, 2007-06-30 11:18:11+02:00, rafal@quant.(none) +6 -6
    Move #pragma implementation to the beginning of the file.

  sql/backup/archive.h@stripped, 2007-06-30 11:18:11+02:00, rafal@quant.(none) +6 -6
    Move #pragma interface to the beginning of the 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:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bkroot/mysql-5.2-backup

--- 1.7/sql/backup/archive.cc	2007-06-30 11:18:29 +02:00
+++ 1.8/sql/backup/archive.cc	2007-06-30 11:18:29 +02:00
@@ -21,12 +21,6 @@
   - Add to Archive_info methods for browsing contents of the archive.
  */
 
-#include "backup_engine.h"
-#include "backup_aux.h"
-#include "archive.h"
-#include "be_default.h"
-#include "be_snapshot.h"
-
 #if defined(USE_PRAGMA_IMPLEMENTATION) || defined(__APPLE_CC__)
 /*
   #pragma implementation is needed on powermac platform as otherwise compiler 
@@ -38,6 +32,12 @@
  */ 
 #pragma implementation
 #endif
+
+#include "backup_engine.h"
+#include "backup_aux.h"
+#include "archive.h"
+#include "be_default.h"
+#include "be_snapshot.h"
 
 
 /***************************************

--- 1.5/sql/backup/archive.h	2007-06-30 11:18:29 +02:00
+++ 1.6/sql/backup/archive.h	2007-06-30 11:18:29 +02:00
@@ -8,12 +8,6 @@
   its description (catalogue)
  */
 
-#include <backup/api_types.h>
-#include <backup/string_pool.h>
-#include <backup/stream.h>
-#include <backup/backup_engine.h>
-#include <backup/meta_backup.h>
-
 #if defined(USE_PRAGMA_INTERFACE) || defined(__APPLE_CC__)
 /*
   #pragma interface is needed on powermac platform as otherwise compiler 
@@ -25,6 +19,12 @@
  */ 
 #pragma interface
 #endif
+
+#include <backup/api_types.h>
+#include <backup/string_pool.h>
+#include <backup/stream.h>
+#include <backup/backup_engine.h>
+#include <backup/meta_backup.h>
 
 namespace backup {