bzr push into mysql-trunk-wl6255 branch (marko.makela:3836 to 3837)

[marko.makela]

 3837 Marko Mäkelä	2012-05-15
      dict_index_set_online_status(): Assert that it is not a fulltext index.

    modified:
      storage/innobase/include/dict0dict.ic
 3836 Marko Mäkelä	2012-05-15
      Add a debug assertion that could have been added in WL#5526.

    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'storage/innobase/include/dict0dict.ic'
--- a/storage/innobase/include/dict0dict.ic	revid:[e-mail]-20120515130611-2bu1cmym7mr0a5ho
+++ b/storage/innobase/include/dict0dict.ic	revid:marko.makela@stripped0120515194611-11m6s50pesyyagf1
@@ -1152,6 +1152,7 @@ dict_index_set_online_status(
 	enum online_index_status	status)	/*!< in: status */
 {
 	ut_ad(!dict_index_is_clust(index));
+	ut_ad(!(index->type & DICT_FTS));
 #ifdef UNIV_SYNC_DEBUG
 	ut_ad(rw_lock_own(dict_index_get_lock(index), RW_LOCK_EX));
 #endif /* UNIV_SYNC_DEBUG */

No bundle (reason: useless for push emails).