bzr push into mysql-trunk-wl6255 branch (marko.makela:3839 to 3840)

[marko.makela]

 3840 Marko Mäkelä	2012-05-16
      row_log_apply(): Assert that the index is a secondary index.

    modified:
      storage/innobase/include/row0log.h
      storage/innobase/row/row0log.cc
 3839 Marko Mäkelä	2012-05-16
      row_undo_mod_remove_clust_low(): Temporarily disable
      the failing assertions on rec_get_trx_id().

    modified:
      storage/innobase/row/row0umod.cc
=== modified file 'storage/innobase/include/row0log.h'
--- a/storage/innobase/include/row0log.h	revid:marko.makela@stripped-20120516132723-kn3bv1vv0es0205r
+++ b/storage/innobase/include/row0log.h	revid:marko.makela@stripped5728-a4paaphifspebox7
@@ -83,7 +83,7 @@ row_log_apply(
 /*==========*/
 	trx_t*		trx,	/*!< in: transaction (for checking if
 				the operation was interrupted) */
-	dict_index_t*	index,	/*!< in/out: index */
+	dict_index_t*	index,	/*!< in/out: secondary index */
 	struct TABLE*	table)	/*!< in/out: MySQL table
 				(for reporting duplicates) */
 	__attribute__((nonnull, warn_unused_result));

=== modified file 'storage/innobase/row/row0log.cc'
--- a/storage/innobase/row/row0log.cc	revid:marko.makela@strippedm-20120516132723-kn3bv1vv0es0205r
+++ b/storage/innobase/row/row0log.cc	revid:marko.makela@stripped28-a4paaphifspebox7
@@ -1033,7 +1033,7 @@ row_log_apply(
 /*==========*/
 	trx_t*		trx,	/*!< in: transaction (for checking if
 				the operation was interrupted) */
-	dict_index_t*	index,	/*!< in/out: index */
+	dict_index_t*	index,	/*!< in/out: secondary index */
 	struct TABLE*	table)	/*!< in/out: MySQL table
 				(for reporting duplicates) */
 {
@@ -1045,6 +1045,7 @@ row_log_apply(
 	dup.n_dup = 0;
 
 	ut_ad(dict_index_is_online_ddl(index));
+	ut_ad(!dict_index_is_clust(index));
 
 	log_free_check();
 

No bundle (reason: useless for push emails).