diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-06-15 14:54:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-15 14:54:23 +0200 |
| commit | 37f5632212fd5cf6aafa272d33ca34da2320d570 (patch) | |
| tree | 792f1e903f969bf293cc2ba8a272df705cf05dc0 /storage/xtradb/include/trx0undo.h | |
| parent | 13982b5a118ab9060d786da646af94d81638bc3b (diff) | |
| parent | 6de579241ed0bf01dfad1a7cede9fde36a1c5c03 (diff) | |
| download | mariadb-git-37f5632212fd5cf6aafa272d33ca34da2320d570.tar.gz | |
merged with XtraDB 1.1.8-26.0
Diffstat (limited to 'storage/xtradb/include/trx0undo.h')
| -rw-r--r-- | storage/xtradb/include/trx0undo.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/storage/xtradb/include/trx0undo.h b/storage/xtradb/include/trx0undo.h index 50aa6d0ac09..4a1e40af505 100644 --- a/storage/xtradb/include/trx0undo.h +++ b/storage/xtradb/include/trx0undo.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -194,16 +194,17 @@ trx_undo_get_first_rec( mtr_t* mtr); /*!< in: mtr */ /********************************************************************//** Tries to add a page to the undo log segment where the undo log is placed. -@return page number if success, else FIL_NULL */ +@return X-latched block if success, else NULL */ UNIV_INTERN -ulint +buf_block_t* trx_undo_add_page( /*==============*/ trx_t* trx, /*!< in: transaction */ trx_undo_t* undo, /*!< in: undo log memory object */ - mtr_t* mtr); /*!< in: mtr which does not have a latch to any + mtr_t* mtr) /*!< in: mtr which does not have a latch to any undo log page; the caller must have reserved the rollback segment mutex */ + __attribute__((nonnull, warn_unused_result)); /********************************************************************//** Frees the last undo log page. The caller must hold the rollback segment mutex. */ |