MDEV-4786 - merge 10.0-monty - 10.0

Fixed archive.archive non-debug failure.

Applied revision:
sergey.vojtovich@oracle.com-20111008171828-vje5pumzvl04rdbb

Archive didn't read blobs from original table while
performing REPAIR TABLE with non-debug builds.

storage/archive/ha_archive.cc:
  Mark all columns for read independently of DBUG state.
  It instructs ::get_row_version2() to read all blobs.

storage/archive/ha_archive.cc

@@ -1518,7 +1518,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
       share->rows_recorded= 0;
       stats.auto_increment_value= 1;
       share->archive_write.auto_increment= 0;
-      my_bitmap_map *org_bitmap= dbug_tmp_use_all_columns(table, table->read_set);
+      my_bitmap_map *org_bitmap= tmp_use_all_columns(table, table->read_set);
 
       while (!(rc= get_row(&archive, table->record[0])))
       {
@@ -1539,7 +1539,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
         }
       }
 
-      dbug_tmp_restore_column_map(table->read_set, org_bitmap);
+      tmp_restore_column_map(table->read_set, org_bitmap);
       share->rows_recorded= (ha_rows)writer.rows;
     }