bzr commit into mysql-6.0-backup branch (charles.bell:2868) Bug#46574

[Chuck Bell]

#At file:///Users/cbell/source/bzr/mysql-6.0-bug-46574/ based on
revid:charles.bell@stripped

 2868 Chuck Bell	2009-09-14 [merge]
      Local merge before push of BUG#46574.

    modified:
      client/backup_stream.c
=== modified file 'client/backup_stream.c'
--- a/client/backup_stream.c	2009-09-10 07:35:02 +0000
+++ b/client/backup_stream.c	2009-09-10 14:38:41 +0000
@@ -1142,7 +1142,7 @@ bcat_add_item(struct st_bstream_image_he
   - BSTREAM_IT_DB:         all databases
 
   The following types of iterators iterate only over items for which
-  some meta-data should be saved in the image.
+  some metadata should be saved in the image.
 
   - BSTREAM_IT_GLOBAL:     all global items in create-dependency order
   - BSTREAM_IT_PERDB:      all per-db items except tables which are enumerated
@@ -1377,8 +1377,8 @@ bcat_db_iterator_free(struct st_bstream_
   Produce CREATE statement for a given item.
 
   Backup stream library calls this function when saving item's
-  meta-data. If function successfully produces the statement, it becomes
-  part of meta-data.
+  metadata. If function successfully produces the statement, it becomes
+  part of metadata.
 
   @param[in]    hdr             catalog reference
   @param[in]    item            item reference
@@ -1409,11 +1409,11 @@ bcat_get_item_create_query(struct st_bst
 
 
 /**
-  Return meta-data (other than CREATE statement) for a given item.
+  Return metadata (other than CREATE statement) for a given item.
 
   Backup stream library calls this function when saving item's
-  meta-data. If function returns successfully, the bytes returned become
-  part of meta-data.
+  metadata. If function returns successfully, the bytes returned become
+  part of metadata.
 
   @param[in]    hdr             catalog reference
   @param[in]    item            item reference
@@ -1446,11 +1446,11 @@ bcat_get_item_create_data(struct st_bstr
 
 
 /**
-  Create database object from its meta-data.
+  Create database object from its metadata.
 
-  When the meta-data section of backup image is read, items can be created
-  as their meta-data is read (so that there is no need to store these
-  meta-data). But this functions stores them in the catalog instead of
+  When the metadata section of backup image is read, items can be created
+  as their metadata is read (so that there is no need to store these
+  metadata). But this functions stores them in the catalog instead of
   creating database objects. So the application can make different use
   of the data, e.g. print it.
 


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