List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 29 2011 2:12pm
Subject:bzr push into mysql-trunk branch (marko.makela:3242 to 3243)
View as plain text  
 3243 Marko Mäkelä	2011-06-29 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/include/trx0sys.h
 3242 Vasil Dimov	2011-06-29 [merge]
      Merge mysql-5.5 -> mysql-trunk

    modified:
      extra/innochecksum.c
=== modified file 'storage/innobase/include/trx0sys.h'
--- a/storage/innobase/include/trx0sys.h	revid:vasil.dimov@strippedy3kqh62
+++ b/storage/innobase/include/trx0sys.h	revid:marko.makela@stripped
@@ -330,6 +330,8 @@ trx_in_trx_list(
 /*============*/
 	const trx_t*	in_trx)		/*!< in: transaction */
 	__attribute__((nonnull, warn_unused_result));
+#endif /* UNIV_DEBUG */
+#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG
 /***********************************************************//**
 Assert that a transaction has been recovered.
 @return TRUE */
@@ -339,7 +341,7 @@ trx_assert_recovered(
 /*=================*/
 	trx_id_t	trx_id)		/*!< in: transaction identifier */
 	__attribute__((warn_unused_result));
-#endif /* UNIV_DEBUG */
+#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).
Thread
bzr push into mysql-trunk branch (marko.makela:3242 to 3243) marko.makela29 Jun