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

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

    modified:
      extra/innochecksum.c
=== modified file 'storage/innobase/include/trx0sys.h'
--- a/storage/innobase/include/trx0sys.h	revid:vasil.dimov@stripped43s
+++ b/storage/innobase/include/trx0sys.h	revid:marko.makela@stripped
@@ -278,6 +278,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 */
@@ -287,6 +288,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).
Thread
bzr push into mysql-5.5 branch (marko.makela:3474 to 3475) marko.makela29 Jun