diff options
| author | unknown <guilhem@gbichot4.local> | 2007-12-31 12:52:45 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-12-31 12:52:45 +0100 |
| commit | 4902e80471e998e26bf5ea3b5f57cf6d79c2471b (patch) | |
| tree | 684b76112ab0e633870f05b86d62746af20a0019 /storage/maria/ma_panic.c | |
| parent | 75a8907ee0d0bf83c396bd0bd6e3bbe3ff523a00 (diff) | |
| parent | 18bc7b695af8b553e6b8151ce7ce2e2d8755881d (diff) | |
| download | mariadb-git-4902e80471e998e26bf5ea3b5f57cf6d79c2471b.tar.gz | |
merge
Diffstat (limited to 'storage/maria/ma_panic.c')
| -rw-r--r-- | storage/maria/ma_panic.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/storage/maria/ma_panic.c b/storage/maria/ma_panic.c index 867abfd1c62..a86563f31fb 100644 --- a/storage/maria/ma_panic.c +++ b/storage/maria/ma_panic.c @@ -98,20 +98,16 @@ int maria_panic(enum ha_panic_function flag) #ifdef CANT_OPEN_FILES_TWICE { /* Open closed files */ char name_buff[FN_REFLEN]; - if (info->s->kfile.file < 0) + MARIA_SHARE *share= info->s; + if (share->kfile.file < 0) { - if ((info->s->kfile.file= my_open(fn_format(name_buff, - info->filename, "", - N_NAME_IEXT,4), - info->mode, - MYF(MY_WME))) < 0) - error = my_errno; - pagecache_file_init(info->s->kfile, &maria_page_crc_check_index, - (info->s->options & HA_OPTION_PAGE_CHECKSUM ? - &maria_page_crc_set_index : - &maria_page_filler_set_normal), - &maria_page_write_failure, info->s); + if ((share->kfile.file= my_open(fn_format(name_buff, + info->filename, "", + N_NAME_IEXT,4), + info->mode, + MYF(MY_WME))) < 0) + error = my_errno; } if (info->dfile.file < 0) { @@ -120,13 +116,10 @@ int maria_panic(enum ha_panic_function flag) info->mode, MYF(MY_WME))) < 0) error = my_errno; - pagecache_file_init(info->dfile, &maria_page_crc_check_data, - (share->options & HA_OPTION_PAGE_CHECKSUM ? - &maria_page_crc_set_normal: - &maria_page_filler_set_normal), - &maria_page_write_failure, share); info->rec_cache.file= info->dfile.file; } + if (share->bitmap.file.file < 0) + share->bitmap.file.file= info->dfile.file; } #endif if (info->was_locked) |