diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-17 11:52:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-02-17 11:52:51 +0200 |
| commit | 4ea57c80b27b7d84ada535eb7fbc1e1b93545b04 (patch) | |
| tree | 995264b4b6367bc603db31e70cd57025ae8f39ce /storage/innobase/include/mtr0mtr.ic | |
| parent | 2837fba743733ced6a5e0beecb67eb307ed44bfe (diff) | |
| parent | f77329ace9a8a415b05ad473970de6dc187327e7 (diff) | |
| download | mariadb-git-4ea57c80b27b7d84ada535eb7fbc1e1b93545b04.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/include/mtr0mtr.ic')
| -rw-r--r-- | storage/innobase/include/mtr0mtr.ic | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/innobase/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic index 1db4a4bd735..755bd49057b 100644 --- a/storage/innobase/include/mtr0mtr.ic +++ b/storage/innobase/include/mtr0mtr.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2010, 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 *****************************************************************************/ @@ -46,6 +46,7 @@ mtr_start( mtr->modifications = FALSE; mtr->inside_ibuf = FALSE; mtr->n_log_recs = 0; + mtr->n_freed_pages = 0; ut_d(mtr->state = MTR_ACTIVE); ut_d(mtr->magic_n = MTR_MAGIC_N); |