bk commit into 6.0 tree (rafal:1.2581) WL#4212

[rsomla]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-03-12 08:18:42+01:00, rafal@quant.(none) +1 -0
  WL#4212: Fixing compile warning due to incorrect type used.

  sql/backup/backup_kernel.h@stripped, 2008-03-12 08:18:38+01:00, rafal@quant.(none) +2 -2
    Fix incorrect type.

diff -Nrup a/sql/backup/backup_kernel.h b/sql/backup/backup_kernel.h
--- a/sql/backup/backup_kernel.h	2008-03-06 12:20:45 +01:00
+++ b/sql/backup/backup_kernel.h	2008-03-12 08:18:38 +01:00
@@ -61,7 +61,7 @@ class Backup_restore_ctx: public backup:
   ~Backup_restore_ctx();
 
   bool is_valid() const;
-  ulong op_id() const;
+  ulonglong op_id() const;
 
   Backup_info*  prepare_for_backup(LEX_STRING location);
   Restore_info* prepare_for_restore(LEX_STRING location);  
@@ -128,7 +128,7 @@ bool Backup_restore_ctx::is_valid() cons
 
 /// Return global id of the backup/restore operation.
 inline
-ulong Backup_restore_ctx::op_id() const
+ulonglong Backup_restore_ctx::op_id() const
 {
   return m_op_id; // inherited from Logger class
 }