bzr commit into mysql-6.0-backup branch (Rafal.Somla:2871) Bug#40587

[Rafal Somla]

#At file:///ext/mysql/bzr/backup/bug40587/ based on revid:rafal.somla@stripped

 2871 Rafal Somla	2009-09-10
      Follow-up patch for BUG#40587. Fix the "metadata" word which was removed 
      by mistake in the original patch.

    modified:
      sql/backup/kernel.cc
=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc	2009-09-10 07:35:02 +0000
+++ b/sql/backup/kernel.cc	2009-09-10 07:37:59 +0000
@@ -5,7 +5,7 @@
 
   @todo Use internal table name representation when passing tables to
         backup/restore drivers.
-  @todo Handle other types of  in Backup_info methods.
+  @todo Handle other types of metadata in Backup_info methods.
   @todo Handle item dependencies when adding new items.
   @todo Handle other kinds of backup locations (far future).
 */
@@ -656,7 +656,7 @@ int Backup_restore_ctx::prepare(::String
   if (!mem_alloc)
     return fatal_error(report_error(ER_OUT_OF_RESOURCES));
 
-  // Freeze all . 
+  // Freeze all metadata. 
 
   DEBUG_SYNC(m_thd, "before_backup_ddl_block");
   ret= obs::bml_get(m_thd);
@@ -681,7 +681,7 @@ int Backup_restore_ctx::prepare(::String
   
   @note This function reports errors.
 
-  @note It is important that changes of  are blocked as part of the
+  @note It is important that changes of metadata are blocked as part of the
   preparations. The set of server objects and their definitions should not
   change after the backup context has been prepared and before the actual backup
   is performed using @c do_backup() method.
@@ -715,7 +715,7 @@ Backup_restore_ctx::prepare_for_backup(S
   
   /*
     Do preparations common to backup and restore operations. After call
-    to prepare() all  changes are blocked.
+    to prepare() all metadata changes are blocked.
    */ 
   DEBUG_SYNC(m_thd, "before_backup_common_prepare");
   if (prepare(backupdir, orig_loc))  // Logs errors and detects interruptions
@@ -853,7 +853,7 @@ Backup_restore_ctx::prepare_for_restore(
 
   /*
     Do preparations common to backup and restore operations. After this call
-    changes of  are blocked.
+    changes of metadata are blocked.
    */ 
   DEBUG_SYNC(m_thd, "before_restore_common_prepare");
   if (prepare(backupdir, orig_loc))
@@ -1103,7 +1103,7 @@ void Backup_restore_ctx::unlock_tables()
   This should reverse all settings made when context was created and prepared.
   If it was requested, the backup/restore location is removed. Also, the backup
   stream memory allocator is shut down. Any other allocated resources are 
-  deleted in the destructor. Changes to  are unblocked.
+  deleted in the destructor. Changes to metadata are unblocked.
   
   @returns 0 or error code if error was detected.
   
@@ -1174,7 +1174,7 @@ int Backup_restore_ctx::close()
   // unlock tables if they are still locked
   unlock_tables();                              // Never errors
 
-  // unfreeze 
+  // unfreeze metadata
   obs::bml_release();                           // Never errors
 
   // restore thread options
@@ -1457,7 +1457,7 @@ int Backup_restore_ctx::do_restore(bool 
   if (report_killed())
     DBUG_RETURN(fatal_error(ER_QUERY_INTERRUPTED));
 
-  DBUG_PRINT("restore", ("Restoring "));
+  DBUG_PRINT("restore", ("Restoring metadata"));
 
   // unless RESTORE... OVERWRITE: return error if database already exists
   if (!overwrite)
@@ -2123,7 +2123,7 @@ void  bcat_db_iterator_free(st_bstream_i
 
 /*****************************************************************
 
-   Services for backup stream library related to 
+   Services for backup stream library related to metadata
    manipulation.
 
  *****************************************************************/
@@ -2358,9 +2358,9 @@ int bcat_get_item_create_query(st_bstrea
 }
 
 /**
-  Get extra  (if any) for a given object.
+  Get extra metadata (if any) for a given object.
  
-  @note Extra  is not used currently.
+  @note Extra metadata is not used currently.
  */ 
 extern "C"
 int bcat_get_item_create_data(st_bstream_image_header *catalogue,


Attachment: [text/bzr-bundle] bzr/[e-mail]