diff options
| author | unknown <guilhem@mysql.com> | 2005-01-16 21:39:21 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-01-16 21:39:21 +0100 |
| commit | 364052161c79f74be13cedf560f87a6687d6d3f3 (patch) | |
| tree | 22c11c7fe0d89e79bf5d07bc49b61253a14dd905 /myisam | |
| parent | f33566b55f7537d7d4e05be4fac722fffa4ce612 (diff) | |
| parent | 30cddcc18700611db6bbc0ed7f629b0fbea05887 (diff) | |
| download | mariadb-git-364052161c79f74be13cedf560f87a6687d6d3f3.tar.gz | |
Merge
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql-common/client.c:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/r/user_var.result:
SCCS merged
ndb/docs/Makefile.am:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_open.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index ab76235e6ef..20eb4e636c3 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -148,9 +148,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) goto err; } /* Don't call realpath() if the name can't be a link */ - if (strcmp(name_buff, org_name)) - (void) my_readlink(index_name, org_name, MYF(0)); - else + if (strcmp(name_buff, org_name) || + my_readlink(index_name, org_name, MYF(0)) == -1) (void) strmov(index_name, org_name); (void) fn_format(data_name,org_name,"",MI_NAME_DEXT,2+4+16); |