bzr push into mysql-trunk-wl6255 branch (marko.makela:3835 to 3836) WL#5526

[marko.makela]

 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
 3835 Marko Mäkelä	2012-05-15
      WL#6255 preparation. Separate index->search_info and index->online_log.
      
      In an attempt to reduce memory usage, WL#5526 piggy-backed the online_log
      pointer in place of the index->search_info. It was thought that the
      adaptive hash index would not be used while building an index online.
      
      With WL#6255, this no longer holds. The adaptive hash index for the
      clustered index must remain accessible while the table is being rebuilt.
      
      BTR_MODIFY_LEAF_APPLY_LOG: Replace with BTR_MODIFY_LEAF.
      BTR_MODIFY_TREE_APPLY_LOG: Replace with BTR_MODIFY_TREE.
      
      btr_search_get_info(): Do not assert that the index is not being built
      online.
      
      btr_cur_search_to_nth_level(): Always use the adaptive hash index.

    modified:
      storage/innobase/btr/btr0cur.cc
      storage/innobase/btr/btr0sea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0sea.h
      storage/innobase/include/btr0sea.ic
      storage/innobase/include/dict0mem.h
      storage/innobase/row/row0log.cc
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	revid:marko.makela@strippedb4dfc
+++ b/storage/innobase/handler/handler0alter.cc	revid:marko.makela@strippedo
@@ -2952,6 +2952,8 @@ ha_innobase::commit_inplace_alter_table(
 		/* Lose the TEMP_INDEX_PREFIX. */
 		for (i = 0; i < ctx->num_to_add; i++) {
 			dict_index_t*	index = ctx->add[i];
+			DBUG_ASSERT(dict_index_get_online_status(index)
+				    == ONLINE_INDEX_COMPLETE);
 			DBUG_ASSERT(*index->name
 				    == TEMP_INDEX_PREFIX);
 			index->name++;

No bundle (reason: useless for push emails).