diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-23 12:55:39 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-23 12:55:39 -0500 |
| commit | b096c34d9220c0d892716befef6be5d9b1393dde (patch) | |
| tree | fdf4ef1c0fd648f3c53d65cdd4fb1e34a004c4b6 /myisammrg | |
| parent | c273526d85d26be7c31f28da0174f67b08aef9c8 (diff) | |
| parent | 67c5514b908a6adfb0cd91dfe6dc9d0b0e21e1c1 (diff) | |
| download | mariadb-git-b096c34d9220c0d892716befef6be5d9b1393dde.tar.gz | |
merged changes from 4.1
include/my_global.h:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
strings/my_vsnprintf.c:
Auto merged
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_open.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index 0dc2f4f9768..f9cdc2bb205 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -67,7 +67,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) while ((length=my_b_gets(&file,buff,FN_REFLEN-1))) { if ((end=buff+length)[-1] == '\n') - end[-1]='\0'; + *--end='\0'; if (!buff[0]) continue; /* Skip empty lines */ if (buff[0] == '#') @@ -86,6 +86,8 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) sizeof(name_buff)-1-dir_length)); VOID(cleanup_dirname(buff,name_buff)); } + else + fn_format(buff, buff, "", "", 0); if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0)))) goto err; if (!m_info) /* First file */ |