diff options
author | unknown <ingo@mysql.com> | 2005-04-28 19:34:05 +0200 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2005-04-28 19:34:05 +0200 |
commit | 45031a44546e1bf0092c9ddcde6b56d7357f3903 (patch) | |
tree | 4e65f44049751fec4d3ff85e114155f9fe894035 /myisammrg | |
parent | 745d52bb3da3afb018061b4e3ec34420a8475389 (diff) | |
parent | 275c8e77907791f62ed334d9cafaba8d734a4d33 (diff) | |
download | mariadb-git-45031a44546e1bf0092c9ddcde6b56d7357f3903.tar.gz |
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
include/my_sys.h:
Auto merged
myisam/myisampack.c:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
Diffstat (limited to 'myisammrg')
-rw-r--r-- | myisammrg/myrg_open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index a59ccb7d966..0dc2f4f9768 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -80,7 +80,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) continue; /* Skip comments */ } - if (!test_if_hard_path(buff)) + if (!has_path(buff)) { VOID(strmake(name_buff+dir_length,buff, sizeof(name_buff)-1-dir_length)); |