bzr commit into mysql-6.0 branch (jperkin:2703)

[Jonathan Perkin]

#At file:///net/helheim/store/bteam/bzr/mysql-6.0.11-alpha-release/

 2703 Jonathan Perkin	2009-04-30
      No C++ comments in C code.
      modified:
        client/backup_stream.c
        sql/backup/stream_v1.c

=== modified file 'client/backup_stream.c'
--- a/client/backup_stream.c	2009-02-27 09:46:43 +0000
+++ b/client/backup_stream.c	2009-04-30 13:06:07 +0000
@@ -454,14 +454,14 @@ str_open_rd(struct st_stream *strm, cons
   uint16                version;
   const unsigned char   backup_magic_bytes[8]=
     {
-      0xE0, // ###.....
-      0xF8, // #####...
-      0x7F, // .#######
-      0x7E, // .######.
-      0x7E, // .######.
-      0x5F, // .#.#####
-      0x0F, // ....####
-      0x03  // ......##
+      0xE0, /* ###..... */
+      0xF8, /* #####... */
+      0x7F, /* .####### */
+      0x7E, /* .######. */
+      0x7E, /* .######. */
+      0x5F, /* .#.##### */
+      0x0F, /* ....#### */
+      0x03  /* ......## */
     };
 #ifdef HAVE_COMPRESS
   const unsigned char   gzip_magic_bytes[3]=
@@ -1007,7 +1007,7 @@ bcat_add_item(struct st_bstream_image_he
     /* Get a reference to the snapshot information. */
     bup_snapshot= *((struct st_backup_snapshot**)
                     dynamic_array_ptr(&bup_catalog->cat_snapshots, snap_num));
-    DBUG_ASSERT(bup_snapshot); // Never fails, snap_num is checked
+    DBUG_ASSERT(bup_snapshot); /* Never fails, snap_num is checked */
     /*
       Check consistency of array position.
       Table items are not numbered per database, but per snapshot.
@@ -1270,7 +1270,7 @@ bcat_iterator_next(struct st_bstream_ima
   /* Note that the array contains pointers only. */
   item= *((struct st_bstream_item_info**)
           dynamic_array_ptr(iter->it_array, iter->it_index));
-  DBUG_ASSERT(item); // Never fails, iter->it_index is checked
+  DBUG_ASSERT(item); /* Never fails, iter->it_index is checked */
 
   DBUG_PRINT("bupstrm", ("next iterator for type: %u", iter->it_type));
   DBUG_PRINT("bupstrm", ("next item: 0x%lx  pos: %lu  type: %d  name: '%.*s'",
@@ -1807,7 +1807,7 @@ backup_catalog_free(struct st_backup_cat
     /* Note that the array contains pointers only. */
     bup_snapshot= *((struct st_backup_snapshot**)
                     dynamic_array_ptr(&bup_catalog->cat_snapshots, idx));
-    DBUG_ASSERT(bup_snapshot); // Never fails, idx is in range
+    DBUG_ASSERT(bup_snapshot); /* Never fails, idx is in range */
     /* The referenced items are freed with their databases. */
     delete_dynamic(&bup_snapshot->snap_index_pos_to_table);
     /* Free the item itself. */
@@ -1839,7 +1839,7 @@ backup_catalog_free(struct st_backup_cat
       /* Note that the array contains pointers only. */
       bup_perdb= *((struct st_backup_perdb**)
                    dynamic_array_ptr(&bup_database->db_perdbs, jdx));
-      DBUG_ASSERT(bup_perdb); // Never fails, jdx is in range
+      DBUG_ASSERT(bup_perdb); /* Never fails, jdx is in range */
       mdata= &bup_perdb->perdb_metadata;
       my_free(mdata->md_data.begin, MYF(MY_ALLOW_ZERO_PTR));
       my_free(mdata->md_query.begin, MYF(MY_ALLOW_ZERO_PTR));
@@ -1858,7 +1858,7 @@ backup_catalog_free(struct st_backup_cat
       /* Note that the array contains pointers only. */
       bup_table= *((struct st_backup_table**)
                    dynamic_array_ptr(&bup_database->db_tables, jdx));
-      DBUG_ASSERT(bup_table); // Never fails, jdx is in range
+      DBUG_ASSERT(bup_table); /* Never fails, jdx is in range */
       mdata= &bup_table->tbl_metadata;
       my_free(mdata->md_data.begin, MYF(MY_ALLOW_ZERO_PTR));
       my_free(mdata->md_query.begin, MYF(MY_ALLOW_ZERO_PTR));
@@ -1902,7 +1902,7 @@ backup_catalog_free(struct st_backup_cat
         */
         bup_global= *((struct st_backup_global**)
                       dynamic_array_ptr(*init_array_p, idx));
-        DBUG_ASSERT(bup_global); // Never fails, idx is in range
+        DBUG_ASSERT(bup_global); /* Never fails, idx is in range */
 
         DBUG_PRINT("bupstrm", ("freeing meta data."));
         mdata= &bup_global->glb_metadata;

=== modified file 'sql/backup/stream_v1.c'
--- a/sql/backup/stream_v1.c	2009-04-23 22:51:32 +0000
+++ b/sql/backup/stream_v1.c	2009-04-30 13:06:07 +0000
@@ -736,7 +736,7 @@ int bstream_wr_catalogue(backup_stream *
 
   wr_error:
 
-  // Free iterator if not already done
+  /* Free iterator if not already done */
   if (it)
     bcat_iterator_free(cat,it);
 
@@ -892,7 +892,7 @@ int bstream_rd_catalogue(backup_stream *
 
   rd_error:
 
-  // Free iterator if not already done
+  /* Free iterator if not already done */
   if (iter)
     bcat_iterator_free(cat,iter);
 
@@ -1064,7 +1064,7 @@ int bstream_wr_db_catalogue(backup_strea
 
   wr_error:
 
-  // Free iterator if not already done
+  /* Free iterator if not already done */
   if (iter)
     bcat_iterator_free(cat,iter);
 
@@ -1336,7 +1336,7 @@ int bstream_wr_meta_data(backup_stream *
 
 wr_error:
 
-  // Free iterators if not already done
+  /* Free iterators if not already done */
   if (titer)
     bcat_iterator_free(cat,titer);
 
@@ -1418,7 +1418,7 @@ int bstream_rd_meta_data(backup_stream *
 
   rd_error:
 
-  // Free iterator if not already done
+  /* Free iterator if not already done */
   if (iter) 
     bcat_iterator_free(cat,iter);