1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Marko Mäkelä 2011-06-29 16:53:16 +03:00
commit 6ebb38a21d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/include/trx0sys.h
View File

@ -278,6 +278,7 @@ ibool
trx_in_trx_list( trx_in_trx_list(
/*============*/ /*============*/
trx_t* in_trx);/*!< in: trx */ trx_t* in_trx);/*!< in: trx */
#if defined UNIV_DEBUG || defined UNIV_BLOB_LIGHT_DEBUG
/***********************************************************//** /***********************************************************//**
Assert that a transaction has been recovered. Assert that a transaction has been recovered.
@return TRUE */ @return TRUE */
@ -287,6 +288,7 @@ trx_assert_recovered(
/*=================*/ /*=================*/
trx_id_t trx_id) /*!< in: transaction identifier */ trx_id_t trx_id) /*!< in: transaction identifier */
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
#endif /* UNIV_DEBUG || UNIV_BLOB_LIGHT_DEBUG */
/*****************************************************************//** /*****************************************************************//**
Updates the offset information about the end of the MySQL binlog entry Updates the offset information about the end of the MySQL binlog entry
which corresponds to the transaction just being committed. In a MySQL which corresponds to the transaction just being committed. In a MySQL