bzr push into mysql-trunk branch (sergey.vojtovich:3480 to 3481) Bug#11756687

[Sergey Vojtovich]

 3481 Sergey Vojtovich	2011-10-08
      BUG#11756687 - 48633: ARCHIVE TABLES ARE NOT UPGRADEABLE
      
      This addition fixes main.archive failure.
      
      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.

    modified:
      storage/archive/ha_archive.cc
 3480 Mattias Jonsson	2011-10-07
      bug#11763825/Bug#56590: PARTITIONS: FULLTEXT SEARCHES FAIL
      
      Confusing error message:
      ERROR 1214 (HY000): The used table type doesn't support FULLTEXT
      indexes
      
      Fixed by adding a new error for this:
      ERROR HY000: FULLTEXT index is not supported for partitioned tables.

    modified:
      mysql-test/r/partition_myisam.result
      mysql-test/t/partition_myisam.test
      sql/share/errmsg-utf8.txt
      sql/sql_table.cc
=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc	2011-10-07 06:03:14 +0000
+++ b/storage/archive/ha_archive.cc	2011-10-08 17:18:28 +0000
@@ -1550,7 +1550,7 @@ int ha_archive::optimize(THD* thd, HA_CH
       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])))
       {
@@ -1571,7 +1571,7 @@ int ha_archive::optimize(THD* thd, HA_CH
         }
       }
 
-      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;
     }
 

No bundle (reason: useless for push emails).