diff options
| author | unknown <guilhem@gbichot4.local> | 2007-07-26 12:15:47 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-07-26 12:15:47 +0200 |
| commit | 79f7cb4e95b18bb2bc5db590532dc0fc6757ebdb (patch) | |
| tree | 05e4d0da2d9825b9bdaf6da3945d6dff441420cf /storage/maria/ma_blockrec.h | |
| parent | 85510db991b5bbaa954bd181e1d02e45ca9f845f (diff) | |
| parent | 6bbca54d7dfa5cc3f5a6da46395b73f77d142527 (diff) | |
| download | mariadb-git-79f7cb4e95b18bb2bc5db590532dc0fc6757ebdb.tar.gz | |
merge
sql/handler.cc:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_close.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_loghandler.h:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/maria_read_log.c:
will merge by hand
Diffstat (limited to 'storage/maria/ma_blockrec.h')
| -rw-r--r-- | storage/maria/ma_blockrec.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/maria/ma_blockrec.h b/storage/maria/ma_blockrec.h index c11c341f782..71feb33cabb 100644 --- a/storage/maria/ma_blockrec.h +++ b/storage/maria/ma_blockrec.h @@ -105,8 +105,6 @@ enum en_page_type { UNALLOCATED_PAGE, HEAD_PAGE, TAIL_PAGE, BLOB_PAGE, MAX_PAGE_ /* Don't allocate memory for too many row extents on the stack */ #define ROW_EXTENTS_ON_STACK 32 -extern uchar maria_bitmap_marker[2]; - /* Functions to convert MARIA_RECORD_POS to/from page:offset */ static inline MARIA_RECORD_POS ma_recordpos(ulonglong page, uint dir_entry) @@ -178,6 +176,7 @@ my_bool _ma_check_if_right_bitmap_type(MARIA_HA *info, ulonglong page, uint *bitmap_pattern); void _ma_bitmap_delete_all(MARIA_SHARE *share); +int _ma_bitmap_create_first(MARIA_SHARE *share); uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn, uint page_type, const uchar *header, @@ -186,3 +185,5 @@ uint _ma_apply_redo_insert_row_head_or_tail(MARIA_HA *info, LSN lsn, uint _ma_apply_redo_purge_row_head_or_tail(MARIA_HA *info, LSN lsn, uint page_type, const uchar *header); +uint _ma_apply_redo_purge_blocks(MARIA_HA *info, LSN lsn, + const uchar *header); |