bk commit into 5.2 tree (cbell:1.2544)

[cbell]

Below is the list of changes that have just been committed into a local
5.2 repository of cbell. When cbell 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-29 09:27:17-04:00, cbell@mysql_cab_desk. +3 -0
  WL#3327 : Consistent snapshot backup for MVCC
  
  This patch corrects some minor build and testing issues discovered on
  the Windows pushbuild machines.
  
  The patch changes long to size_t.

  sql/backup/be_default.cc@stripped, 2007-06-29 09:27:13-04:00, cbell@mysql_cab_desk. +5 -5
    WL#3327 : Consistent snapshot backup for MVCC
    
    This patch corrects some minor build and testing issues discovered on
    the Windows pushbuild machines.
    
    The patch changes long to size_t.

  sql/backup/buffer_iterator.cc@stripped, 2007-06-29 09:27:13-04:00, cbell@mysql_cab_desk. +6
-6
    WL#3327 : Consistent snapshot backup for MVCC
    
    This patch corrects some minor build and testing issues discovered on
    the Windows pushbuild machines.
    
    The patch changes long to size_t.

  sql/backup/buffer_iterator.h@stripped, 2007-06-29 09:27:14-04:00, cbell@mysql_cab_desk. +11
-11
    WL#3327 : Consistent snapshot backup for MVCC
    
    This patch corrects some minor build and testing issues discovered on
    the Windows pushbuild machines.
    
    The patch changes long to size_t.

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.2_WL_3776

--- 1.2/sql/backup/be_default.cc	2007-06-29 09:27:25 -04:00
+++ 1.3/sql/backup/be_default.cc	2007-06-29 09:27:25 -04:00
@@ -321,7 +321,7 @@
       }
       else
       {
-        uint rec_size= 0;
+        size_t rec_size= 0;
         byte *rec_ptr= 0;
 
         rec_buffer.initialize(cur_table->record[0], size);
@@ -341,7 +341,7 @@
   */
   case READ_RCD_BUFFER:
   {
-    uint rec_size= 0; 
+    size_t rec_size= 0; 
 
     rec_size= rec_buffer.get_next((byte **)&ptr, (buf.size - META_SIZE));
     if (rec_buffer.num_windows(buf.size - META_SIZE) == 0)
@@ -409,7 +409,7 @@
     }
     else
     {
-      uint bb_size= 0;
+      size_t bb_size= 0;
       byte *blob_ptr= 0;
 
       ((Field_blob*) cur_table->field[*cur_blob])->get_ptr((uchar **)&ptr);
@@ -432,7 +432,7 @@
 */
   case READ_BLOB_BUFFER:
   {
-    uint bb_size= 0;
+    size_t bb_size= 0;
 
     bb_size= blob_buffer.get_next((byte **)&ptr, (buf.size - META_SIZE));
     if (blob_buffer.num_windows(buf.size - META_SIZE) == 0)
@@ -813,7 +813,7 @@
       mode= WRITE_BLOB;
       break;
     }
-
+ 
     /*
       Save the part and keep reading.
     */

--- 1.1/sql/backup/buffer_iterator.cc	2007-06-29 09:27:25 -04:00
+++ 1.2/sql/backup/buffer_iterator.cc	2007-06-29 09:27:25 -04:00
@@ -36,7 +36,7 @@
  * @param  buff_ptr (in) a pointer to a block of memory
  * @param  size     (in) the maximum size of the data
  */
-int Buffer_iterator::initialize(byte *buff_ptr, long size)
+int Buffer_iterator::initialize(byte *buff_ptr, size_t size)
 {
   DBUG_ENTER("buffer_iterator::initialize(buff_ptr, size, window)");
   buffer= buff_ptr;
@@ -56,7 +56,7 @@
  *
  * @param  size     (in) the maximum size of the data
  */
-int Buffer_iterator::initialize(long size)
+int Buffer_iterator::initialize(size_t size)
 {
   DBUG_ENTER("buffer_iterator::initialize(size, window)");
   buffer= (byte *)my_malloc(size, MYF(MY_WME));
@@ -94,9 +94,9 @@
  * 
  * @retval the size of the window
  */
-long Buffer_iterator::get_next(byte **buff_ptr, long window)
+size_t Buffer_iterator::get_next(byte **buff_ptr, size_t window)
 {
-  long bytes_read;
+  size_t bytes_read;
 
   DBUG_ENTER("buffer_iterator::get_next()");
   *buff_ptr= cur_ptr;
@@ -136,7 +136,7 @@
  * @retval 0  success
  * @retval 1  window size exceeds maximum size of the block of data
  */
-int Buffer_iterator::put_next(byte *buff_ptr, long size)
+int Buffer_iterator::put_next(byte *buff_ptr, size_t size)
 {
   DBUG_ENTER("buffer_iterator::put_next()");
   /*
@@ -163,7 +163,7 @@
  *
  * @retval the number of windows left to read
  */
-int Buffer_iterator::num_windows(long size)
+int Buffer_iterator::num_windows(size_t size)
 {
   int num_windows;
   DBUG_ENTER("buffer_iterator::num_windows()");

--- 1.2/sql/backup/buffer_iterator.h	2007-06-29 09:27:25 -04:00
+++ 1.3/sql/backup/buffer_iterator.h	2007-06-29 09:27:25 -04:00
@@ -72,21 +72,21 @@
 class Buffer_iterator
 {
   public:
-    int initialize(byte *buff_ptr, long size);
-    int initialize(long size);
+    int initialize(byte *buff_ptr, size_t size);
+    int initialize(size_t size);
     int reset();
-    long get_next(byte **buff_ptr, long window);
-    int put_next(byte *buff_ptr, long size);
-    int num_windows(long size);
+    size_t get_next(byte **buff_ptr, size_t window);
+    int put_next(byte *buff_ptr, size_t size);
+    int num_windows(size_t size);
     byte *get_base_ptr();
 
   private: 
-    byte *buffer;        ///< The pointer to the block of data to iterate
-    byte *cur_ptr;       ///< The current position in the buffer
-    long max_size;       ///< The maximum size of the block of data
-    long window_size;    ///< The size of the window to read
-    long cur_bytes_read; ///< The number of bytes read
-    bool alloc_used;     ///< Indicates whether to dealloc memory or not
+    byte *buffer;          ///< The pointer to the block of data to iterate
+    byte *cur_ptr;         ///< The current position in the buffer
+    size_t max_size;       ///< The maximum size of the block of data
+    size_t window_size;    ///< The size of the window to read
+    size_t cur_bytes_read; ///< The number of bytes read
+    bool alloc_used;       ///< Indicates whether to dealloc memory or not
 };
 
 #endif