List:Commits« Previous MessageNext Message »
From:cbell Date:June 29 2007 5:16am
Subject:bk commit into 5.2 tree (cbell:1.2543)
View as plain text  
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 01:15:46-04:00, cbell@mysql_cab_desk. +6 -0
  WL#3776 : Consistent snapshot backup for MVCC
  
  This patch corrects some minor build and testing issues discovered on 
  Linux once all patches were applied.

  mysql-test/r/backup.result@stripped, 2007-06-29 01:15:41-04:00, cbell@mysql_cab_desk. +3 -3
    WL#3776 : Consistent snapshot backup for MVCC
    
    This patch fixes a testing error found on Linux.

  mysql-test/t/backup.test@stripped, 2007-06-29 01:15:41-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3776 : Consistent snapshot backup for MVCC
    
    This patch fixes a testing error found on Linux.

  sql/backup/be_default.cc@stripped, 2007-06-29 01:15:42-04:00, cbell@mysql_cab_desk. +11 -11
    WL#3776 : Consistent snapshot backup for MVCC
    
    This patch corrects a build warning encountered on Linux.

  sql/backup/be_default.h@stripped, 2007-06-29 01:15:42-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3776 : Consistent snapshot backup for MVCC
    
    This patch corrects a build warning encountered on Linux.

  sql/backup/be_snapshot.h@stripped, 2007-06-29 01:15:42-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3776 : Consistent snapshot backup for MVCC
    
    This patch fixes a build warning found on Linux.

  sql/backup/buffer_iterator.h@stripped, 2007-06-29 01:15:43-04:00, cbell@mysql_cab_desk. +2 -0
    WL#3776 : Consistent snapshot backup for MVCC
    
    This patch fixes a compile error found on Linux.

# 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/mysql-test/r/backup.result	2007-06-29 01:15:53 -04:00
+++ 1.3/mysql-test/r/backup.result	2007-06-29 01:15:53 -04:00
@@ -208,7 +208,7 @@
 
 Remember to keep the server_id the same as it was when the promoted slave was a slave!
 
-If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave?s hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
+If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave's hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
 
 Failover and Invoked Objects
 ----------------------------
@@ -262,7 +262,7 @@
 
 Remember to keep the server_id the same as it was when the promoted slave was a slave!
 
-If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave?s hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
+If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave's hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
 
 Failover and Invoked Objects
 ----------------------------
@@ -372,7 +372,7 @@
 
 Remember to keep the server_id the same as it was when the promoted slave was a slave!
 
-If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave?s hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
+If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave's hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
 
 Failover and Invoked Objects
 ----------------------------

--- 1.2/mysql-test/t/backup.test	2007-06-29 01:15:53 -04:00
+++ 1.3/mysql-test/t/backup.test	2007-06-29 01:15:53 -04:00
@@ -237,7 +237,7 @@
 
 Remember to keep the server_id the same as it was when the promoted slave was a slave!
 
-If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave?s hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
+If you have applications that use embedded hostnames or IP addresses in their connections to the master, you have two choices; 1) you can change the slave's hostname and IP to that of the master and restart the server, or 2) you can redirect your clients to the promoted slave.
 
 Failover and Invoked Objects
 ----------------------------

--- 1.1/sql/backup/be_default.cc	2007-06-29 01:15:53 -04:00
+++ 1.2/sql/backup/be_default.cc	2007-06-29 01:15:53 -04:00
@@ -325,7 +325,7 @@
         byte *rec_ptr= 0;
 
         rec_buffer.initialize(cur_table->record[0], size);
-        rec_size= rec_buffer.get_next((::byte **)&rec_ptr, 
+        rec_size= rec_buffer.get_next((byte **)&rec_ptr, 
           (buf.size - META_SIZE));
         *buf.data= RCD_FIRST; // first part
         memcpy((byte *)buf.data + META_SIZE, rec_ptr, rec_size);
@@ -343,7 +343,7 @@
   {
     uint rec_size= 0; 
 
-    rec_size= rec_buffer.get_next((::byte **)&ptr, (buf.size - META_SIZE));
+    rec_size= rec_buffer.get_next((byte **)&ptr, (buf.size - META_SIZE));
     if (rec_buffer.num_windows(buf.size - META_SIZE) == 0)
     {
       *buf.data= RCD_LAST;
@@ -413,12 +413,12 @@
       byte *blob_ptr= 0;
 
       ((Field_blob*) cur_table->field[*cur_blob])->get_ptr((uchar **)&ptr);
-      blob_buffer.initialize((::byte *)ptr, size);
+      blob_buffer.initialize((byte *)ptr, size);
       *buf.data= BLOB_FIRST;   //first block
       uint32 field_size= 
         ((Field_blob*) cur_table->field[*cur_blob])->get_length();
       int4store(buf.data + META_SIZE, field_size);     //save max size
-      bb_size= blob_buffer.get_next((::byte **)&blob_ptr, 
+      bb_size= blob_buffer.get_next((byte **)&blob_ptr, 
         (buf.size - META_SIZE - 4));
       memcpy((byte *)buf.data + META_SIZE + 4, blob_ptr, bb_size);
       buf.size = bb_size + META_SIZE + 4;
@@ -434,7 +434,7 @@
   {
     uint bb_size= 0;
 
-    bb_size= blob_buffer.get_next((::byte **)&ptr, (buf.size - META_SIZE));
+    bb_size= blob_buffer.get_next((byte **)&ptr, (buf.size - META_SIZE));
     if (blob_buffer.num_windows(buf.size - META_SIZE) == 0)
     {
       *buf.data= BLOB_LAST;
@@ -705,7 +705,7 @@
       case RCD_FIRST:
       {
         rec_buffer.initialize(cur_table->s->reclength);
-        rec_buffer.put_next((::byte *)buf.data + META_SIZE, size);
+        rec_buffer.put_next((byte *)buf.data + META_SIZE, size);
         mode= WRITE_RCD;
         break;
       }
@@ -715,7 +715,7 @@
       */
       case RCD_DATA:
       {
-        rec_buffer.put_next((::byte *)buf.data + META_SIZE, size);
+        rec_buffer.put_next((byte *)buf.data + META_SIZE, size);
         mode= WRITE_RCD;
         break;
 
@@ -725,7 +725,7 @@
       */
       case RCD_LAST:
       {
-        rec_buffer.put_next((::byte *)buf.data + META_SIZE, size);
+        rec_buffer.put_next((byte *)buf.data + META_SIZE, size);
         ptr= (byte *)rec_buffer.get_base_ptr();
         memcpy(cur_table->record[0], ptr, cur_table->s->reclength);
         mode= CHECK_BLOBS;
@@ -809,7 +809,7 @@
       max_blob_size= uint4korr(buf.data + META_SIZE);
       blob_buffer.initialize(max_blob_size);
       size= buf.size - META_SIZE - 4;
-      blob_buffer.put_next((::byte *)buf.data + META_SIZE + 4, size);
+      blob_buffer.put_next((byte *)buf.data + META_SIZE + 4, size);
       mode= WRITE_BLOB;
       break;
     }
@@ -819,7 +819,7 @@
     */
     case BLOB_DATA:
     {
-      blob_buffer.put_next((::byte *)buf.data + META_SIZE, size);
+      blob_buffer.put_next((byte *)buf.data + META_SIZE, size);
       mode= WRITE_BLOB;
       break;
     }
@@ -829,7 +829,7 @@
     */
     case BLOB_LAST:
     {
-      blob_buffer.put_next((::byte *)buf.data + META_SIZE, size);
+      blob_buffer.put_next((byte *)buf.data + META_SIZE, size);
       ptr= (byte *)blob_buffer.get_base_ptr();
       ((Field_blob*) cur_table->field[*cur_blob])->set_ptr(max_blob_size, 
         (uchar *)ptr);

--- 1.2/sql/backup/be_default.h	2007-06-29 01:15:53 -04:00
+++ 1.3/sql/backup/be_default.h	2007-06-29 01:15:53 -04:00
@@ -57,7 +57,7 @@
     const version_t version() const { return 0; };
     result_t get_backup(const uint32, const Table_list &tables, 
                         Backup_driver* &drv);
-    result_t get_restore(version_t ver, const uint32, const Table_list &tables,
+    result_t get_restore(const version_t ver, const uint32, const Table_list &tables,
                          Restore_driver* &drv);
 
     /*

--- 1.1/sql/backup/buffer_iterator.h	2007-06-29 01:15:53 -04:00
+++ 1.2/sql/backup/buffer_iterator.h	2007-06-29 01:15:53 -04:00
@@ -3,6 +3,8 @@
 
 #include "mysql_priv.h"
 
+using backup::byte;
+
 /**
  * @class Buffer_iterator
  *

--- 1.1/sql/backup/be_snapshot.h	2007-06-29 01:15:53 -04:00
+++ 1.2/sql/backup/be_snapshot.h	2007-06-29 01:15:53 -04:00
@@ -38,7 +38,7 @@
     const version_t version() const { return 0; };
     result_t get_backup(const uint32, const Table_list &tables, Backup_driver*
 &drv);
-    result_t get_restore(version_t ver, const uint32, const Table_list &tables,
+    result_t get_restore(const version_t ver, const uint32, const Table_list &tables,
                          Restore_driver* &drv);
   private:
     THD *m_thd;     ///< Pointer to the current thread.

Thread
bk commit into 5.2 tree (cbell:1.2543)cbell29 Jun