diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2007-06-07 01:01:43 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2007-06-07 01:01:43 +0300 |
| commit | 42cde8a7b28902e52e4b8339dedb110476e43e6e (patch) | |
| tree | 8a75fdf8f7edf3fb9c8276165a2778ffe91d6c31 /storage/maria/maria_pack.c | |
| parent | 3dee38472068361f38b5f156b52d786dd0b8e24e (diff) | |
| download | mariadb-git-42cde8a7b28902e52e4b8339dedb110476e43e6e.tar.gz | |
rec_lsn (first REDO LSN( is now given to the page cache on unpinning
Added maria_clone(), needed by future REPAIR code
storage/maria/unittest/ma_pagecache_consist.c:
Change mode to -rw-rw-r--
storage/maria/unittest/lockman-t.c:
Change mode to -rw-rw-r--
storage/maria/unittest/lockman1-t.c:
Change mode to -rw-rw-r--
storage/maria/unittest/lockman2-t.c:
Change mode to -rw-rw-r--
storage/maria/unittest/trnman-t.c:
Change mode to -rw-rw-r--
include/maria.h:
Added prototype for maria_clone (for future)
storage/maria/ha_maria.cc:
Move filename to share structure
storage/maria/ma_blockrec.c:
rec_lsn (first REDO LSN( is now given to the page cache on unpinning
Removed impossible lock handling in get_head_or_tail_page()
Changed calls ot translog_write_record() to remember rec_lsn
Removed some logging in csse of not transactions
storage/maria/ma_delete.c:
info->filename -> info->s->open_file_name
storage/maria/ma_loghandler.c:
Indentation fixes
storage/maria/ma_open.c:
Added maria_clone(), needed by future REPAIR code
storage/maria/ma_packrec.c:
Fixed typo in comment
storage/maria/ma_pagecache.c:
Added comment.
Allow setting REC_LSN in case of read lock
storage/maria/ma_update.c:
info->filename -> info->s->open_file_name
storage/maria/ma_write.c:
info->filename -> info->s->open_file_name
storage/maria/maria_def.h:
info->filename -> info->s->open_file_name
Added have_rtree to simplify test in ma_clone()
storage/maria/maria_ftdump.c:
info->filename -> info->s->open_file_name
storage/maria/maria_pack.c:
info->filename -> info->s->open_file_name
storage/maria/trnman.h:
Added rec_lsn
Diffstat (limited to 'storage/maria/maria_pack.c')
| -rw-r--r-- | storage/maria/maria_pack.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/maria/maria_pack.c b/storage/maria/maria_pack.c index f1b3903c944..f6e962191c2 100644 --- a/storage/maria/maria_pack.c +++ b/storage/maria/maria_pack.c @@ -509,9 +509,11 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table) /* Create temporary or join file */ if (backup) - VOID(fn_format(org_name,isam_file->filename,"",MARIA_NAME_DEXT,2)); + VOID(fn_format(org_name,isam_file->s->open_file_name,"",MARIA_NAME_DEXT, + 2)); else - VOID(fn_format(org_name,isam_file->filename,"",MARIA_NAME_DEXT,2+4+16)); + VOID(fn_format(org_name,isam_file->s->open_file_name,"",MARIA_NAME_DEXT, + 2+4+16)); if (init_pagecache(maria_pagecache, MARIA_MIN_PAGE_CACHE_SIZE, 0, 0, maria_block_size) == 0) @@ -705,7 +707,8 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table) { if (backup) { - if (my_rename(org_name,make_old_name(temp_name,isam_file->filename), + if (my_rename(org_name,make_old_name(temp_name, + isam_file->s->open_file_name), MYF(MY_WME))) error=1; else |