diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-10-26 11:44:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-10-26 11:44:28 +0300 |
| commit | 91b5e9352a82b096197aa9f24f149cf3bf892b8a (patch) | |
| tree | 644aa74ed246e7c4530392e1c9e24800dbfdfdc9 /storage/innobase/include/fsp0fsp.h | |
| parent | 5cd2cb0c4f6f63d44f9d130d4f2e1f11b5d4064e (diff) | |
| download | mariadb-git-91b5e9352a82b096197aa9f24f149cf3bf892b8a.tar.gz | |
Revert most of revno 3560.9.1 (Bug#12704861)
This was an attempt to address problems with the Bug#12612184 fix.
Even with this follow-up fix, crash recovery can be broken.
Let us fix the bug later.
Diffstat (limited to 'storage/innobase/include/fsp0fsp.h')
| -rw-r--r-- | storage/innobase/include/fsp0fsp.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index 4c58d6075e6..b7322944189 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -179,11 +179,7 @@ fseg_alloc_free_page_general( with fsp_reserve_free_extents, then there is no need to do the check for this individual page */ - mtr_t* mtr, /* in/out: mini-transaction */ - mtr_t* init_mtr);/* in/out: mtr or another mini-transaction - in which the page should be initialized, - or NULL if this is a "fake allocation" of - a page that was previously freed in mtr */ + mtr_t* mtr); /* in/out: mini-transaction */ /************************************************************************** Reserves free pages from a tablespace. All mini-transactions which may use several pages from the tablespace should call this function beforehand |