mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
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
This commit is contained in:
commit
7aecbab85c
11 changed files with 83 additions and 23 deletions
|
|
@ -26,9 +26,11 @@
|
|||
/*
|
||||
Reads the content of a symbolic link
|
||||
If the file is not a symbolic link, return the original file name in to.
|
||||
Returns: 0 if table was a symlink,
|
||||
1 if table was a normal file
|
||||
-1 on error.
|
||||
|
||||
RETURN
|
||||
0 If filename was a symlink, (to will be set to value of symlink)
|
||||
1 If filename was a normal file (to will be set to filename)
|
||||
-1 on error.
|
||||
*/
|
||||
|
||||
int my_readlink(char *to, const char *filename, myf MyFlags)
|
||||
|
|
@ -58,6 +60,7 @@ int my_readlink(char *to, const char *filename, myf MyFlags)
|
|||
}
|
||||
else
|
||||
to[length]=0;
|
||||
DBUG_PRINT("exit" ,("result: %d", result));
|
||||
DBUG_RETURN(result);
|
||||
#endif /* HAVE_READLINK */
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue