bk commit into 6.0 tree (jperkin:1.2623)

[Jonathan Perkin]

Below is the list of changes that have just been committed into a local
6.0 repository of jperkin.  When jperkin 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, 2008-04-22 20:28:51+02:00, jperkin@stripped +2 -0
  kernel.cc, backup_engine.h:
    Re-order previous to fix Windows compile.

  sql/backup/backup_engine.h@stripped, 2008-04-22 20:28:11+02:00, jperkin@stripped +1 -1
    Re-order previous to fix Windows compile.

  sql/backup/kernel.cc@stripped, 2008-04-22 20:28:28+02:00, jperkin@stripped +1 -1
    Re-order previous to fix Windows compile.

diff -Nrup a/sql/backup/backup_engine.h b/sql/backup/backup_engine.h
--- a/sql/backup/backup_engine.h	2008-04-18 16:27:23 +02:00
+++ b/sql/backup/backup_engine.h	2008-04-22 20:28:11 +02:00
@@ -189,7 +189,7 @@ class Driver
   virtual void  free() {};
 
   /// Unknown size constant used for backup image size estimates.
-  static const size_t UNKNOWN_SIZE= static_cast<size_t>(-1);
+  static const size_t UNKNOWN_SIZE;
 
  protected:
 
diff -Nrup a/sql/backup/kernel.cc b/sql/backup/kernel.cc
--- a/sql/backup/kernel.cc	2008-04-21 17:54:07 +02:00
+++ b/sql/backup/kernel.cc	2008-04-22 20:28:28 +02:00
@@ -2221,6 +2221,6 @@ void finish_backup_or_restore()
   a pure symbolic constant (no need to allocate memory). If someone knows
   how to achieve that and keep xlc happy, please let me know. /Rafal
 */ 
-const size_t Driver::UNKNOWN_SIZE;
+const size_t Driver::UNKNOWN_SIZE= static_cast<size_t>(-1);
 
 } // backup namespace