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/mtr0mtr.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/mtr0mtr.h')
| -rw-r--r-- | storage/xtradb/include/mtr0mtr.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/storage/xtradb/include/mtr0mtr.h b/storage/xtradb/include/mtr0mtr.h index 7f608546cc2..46f1ff9310c 100644 --- a/storage/xtradb/include/mtr0mtr.h +++ b/storage/xtradb/include/mtr0mtr.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 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 *****************************************************************************/ @@ -50,7 +50,9 @@ first 3 values must be RW_S_LATCH, RW_X_LATCH, RW_NO_LATCH */ #define MTR_MEMO_PAGE_S_FIX RW_S_LATCH #define MTR_MEMO_PAGE_X_FIX RW_X_LATCH #define MTR_MEMO_BUF_FIX RW_NO_LATCH -#define MTR_MEMO_MODIFY 54 +#ifdef UNIV_DEBUG +# define MTR_MEMO_MODIFY 54 +#endif /* UNIV_DEBUG */ #define MTR_MEMO_S_LOCK 55 #define MTR_MEMO_X_LOCK 56 @@ -376,6 +378,9 @@ struct mtr_struct{ ulint n_log_recs; /* count of how many page initial log records have been written to the mtr log */ + ulint n_freed_pages; + /* number of pages that have been freed in + this mini-transaction */ ulint log_mode; /* specifies which operations should be logged; default value MTR_LOG_ALL */ ib_uint64_t start_lsn;/* start lsn of the possible log entry for |