bzr push into mysql-5.1 branch (marko.makela:3660 to 3661) Bug#12612184

[marko.makela]

 3661 Marko Mäkelä	2011-06-29
      Bug #12612184 BLOB debug code cleanup: Forgot an #if
      around the declaration of trx_assert_recovered().

    modified:
      storage/innodb_plugin/include/trx0sys.h
 3660 Vasil Dimov	2011-06-29 [merge]
      Merge mysql-5.0 -> mysql-5.1

    modified:
      extra/innochecksum.c
=== modified file 'storage/innodb_plugin/include/trx0sys.h'
--- a/storage/innodb_plugin/include/trx0sys.h	revid:vasil.dimov@stripped-20110629112945-t2n8t5vd8t34i30g
+++ b/storage/innodb_plugin/include/trx0sys.h	revid:marko.makela@stripped629134841-5c73f0s16w6ojc8n
@@ -284,6 +284,7 @@ ibool
 trx_in_trx_list(
 /*============*/
 	trx_t*	in_trx);/*!< in: trx */
+#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG
 /***********************************************************//**
 Assert that a transaction has been recovered.
 @return TRUE */
@@ -293,6 +294,7 @@ trx_assert_recovered(
 /*=================*/
 	trx_id_t	trx_id)		/*!< in: transaction identifier */
 	__attribute__((warn_unused_result));
+#endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */
 /*****************************************************************//**
 Updates the offset information about the end of the MySQL binlog entry
 which corresponds to the transaction just being committed. In a MySQL

No bundle (reason: useless for push emails).