diff options
| author | unknown <monty@mysql.com> | 2005-01-18 04:03:26 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-18 04:03:26 +0200 |
| commit | 7aecbab85c5059c9d1f89188d30ac2c0dbae3ca6 (patch) | |
| tree | bb697cb498858b14ae0d525938dd3fcd68d13eaa /myisam/mi_open.c | |
| parent | 2524517978fe7a3d0f61a67bb7a558663b559cac (diff) | |
| parent | 985805ce6afefaf2715732809aa00c5396990662 (diff) | |
| download | mariadb-git-7aecbab85c5059c9d1f89188d30ac2c0dbae3ca6.tar.gz | |
Merge with global tree
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/order_by.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/order_by.test:
Merge
sql/sql_lex.cc:
Merge
sql/sql_yacc.yy:
Use local copy
Diffstat (limited to 'myisam/mi_open.c')
| -rw-r--r-- | myisam/mi_open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 20eb4e636c3..9a6cfe9f33c 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -148,7 +148,7 @@ 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) || + 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); |