diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
| commit | 557f0d3ad04111e274d709de5fd9879961772210 (patch) | |
| tree | d7d1767519b4631349ca244a988478f808163919 /storage/maria/ma_open.c | |
| parent | db0aed93482759844af7b39c9bf6e7fe141f28f6 (diff) | |
| parent | 27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (diff) | |
| download | mariadb-git-557f0d3ad04111e274d709de5fd9879961772210.tar.gz | |
5.2->5.3 merge
Diffstat (limited to 'storage/maria/ma_open.c')
| -rw-r--r-- | storage/maria/ma_open.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index a7287e75127..5c507ba1bfa 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -1842,6 +1842,7 @@ void _ma_set_index_pagecache_callbacks(PAGECACHE_FILE *file, int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name, File file_to_dup __attribute__((unused))) { + char *data_name= share->data_file_name.str; char real_data_name[FN_REFLEN]; if (org_name) @@ -1855,12 +1856,12 @@ int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name, my_errno= HA_WRONG_CREATE_OPTION; return 1; } + data_name= real_data_name; } } info->dfile.file= share->bitmap.file.file= - my_open(share->data_file_name.str, share->mode | O_SHARE, - MYF(MY_WME)); + my_open(data_name, share->mode | O_SHARE, MYF(MY_WME)); return info->dfile.file >= 0 ? 0 : 1; } |