List:Commits« Previous MessageNext Message »
From:rsomla Date:June 29 2007 7:36am
Subject:bk commit into 5.2 tree (rafal:1.2545)
View as plain text  
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-29 09:34:36+02:00, rafal@quant.(none) +6 -0
  WL#3327: Fixes to avoid compilation warnings.

  sql/backup/archive.cc@stripped, 2007-06-29 09:34:33+02:00, rafal@quant.(none) +1 -1
    Remove unused parameter.

  sql/backup/be_default.cc@stripped, 2007-06-29 09:34:33+02:00, rafal@quant.(none) +1 -1
    Remove unused parameter.

  sql/backup/be_default.h@stripped, 2007-06-29 09:34:33+02:00, rafal@quant.(none) +1 -1
    Change type of META_SIZE to avoid type conversion warnings.

  sql/backup/be_snapshot.cc@stripped, 2007-06-29 09:34:33+02:00, rafal@quant.(none) +1 -1
    Remove unused parameter.

  sql/backup/meta_backup.cc@stripped, 2007-06-29 09:34:33+02:00, rafal@quant.(none) +1 -2
    Layout change.

  sql/backup/sql_backup.cc@stripped, 2007-06-29 09:34:33+02:00, rafal@quant.(none) +2 -2
    Fix function declarations to match the definitions.

# 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.2/sql/backup/be_default.cc	2007-06-29 09:36:03 +02:00
+++ 1.3/sql/backup/be_default.cc	2007-06-29 09:36:03 +02:00
@@ -467,7 +467,7 @@
   * @retval ERROR  if cannot create restore driver class.
   * @retval OK     on success.
   */
-result_t Engine::get_restore(version_t ver, const uint32, 
+result_t Engine::get_restore(version_t, const uint32, 
                              const Table_list &tables, Restore_driver* &drv)
 {
   DBUG_ENTER("Engine::get_restore");

--- 1.3/sql/backup/be_default.h	2007-06-29 09:36:03 +02:00
+++ 1.4/sql/backup/be_default.h	2007-06-29 09:36:03 +02:00
@@ -15,7 +15,7 @@
 using backup::Table_ref;
 using backup::Buffer;
 
-const uint META_SIZE= 1;
+const size_t META_SIZE= 1;
 
 /*
   The following are the flags for the first byte in the data layout for

--- 1.1/sql/backup/be_snapshot.cc	2007-06-29 09:36:03 +02:00
+++ 1.2/sql/backup/be_snapshot.cc	2007-06-29 09:36:03 +02:00
@@ -143,7 +143,7 @@
  *
  * @retval Error code or backup::OK on success.
  */
-result_t Engine::get_restore(version_t ver, const uint32, const Table_list &tables,
+result_t Engine::get_restore(version_t, const uint32, const Table_list &tables,
 Restore_driver* &drv)
 {
   DBUG_ENTER("Engine::get_restore");

--- 1.5/sql/backup/archive.cc	2007-06-29 09:36:03 +02:00
+++ 1.6/sql/backup/archive.cc	2007-06-29 09:36:03 +02:00
@@ -538,7 +538,7 @@
   String          name;
   node            *next;
 
-  node(const Image_info::Tables &t,
+  node(const Image_info::Tables&,
        const StringPool::Key &k,
        const String &nm): db(k), next(NULL)
   {

--- 1.5/sql/backup/meta_backup.cc	2007-06-29 09:36:03 +02:00
+++ 1.6/sql/backup/meta_backup.cc	2007-06-29 09:36:03 +02:00
@@ -83,8 +83,7 @@
   @pre  Stream is at the beginning of a saved meta-data chunk.
   @post Stream is at the beginning of the next chunk.
  */
-int
-restore_meta_data(THD *thd, Restore_info &info, IStream &s)
+int restore_meta_data(THD *thd, Restore_info &info, IStream &s)
 {
   DBUG_ENTER("restore_meta_data");
   Archive_info::Item *it; // save pointer to item read form the stream

--- 1.10/sql/backup/sql_backup.cc	2007-06-29 09:36:03 +02:00
+++ 1.11/sql/backup/sql_backup.cc	2007-06-29 09:36:03 +02:00
@@ -930,10 +930,10 @@
 namespace backup {
 
 // defined in meta_backup.cc
-bool restore_meta_data(THD*, Restore_info&, IStream&);
+int restore_meta_data(THD*, Restore_info&, IStream&);
 
 // defined in data_backup.cc
-bool restore_table_data(THD*, Restore_info&, IStream&);
+int restore_table_data(THD*, Restore_info&, IStream&);
 
 } // backup namespace
 
Thread
bk commit into 5.2 tree (rafal:1.2545)rsomla29 Jun