diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysys/my_symlink.c | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysys/my_symlink.c')
| -rw-r--r-- | mysys/my_symlink.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c index 9657ea6bf58..b001354275d 100644 --- a/mysys/my_symlink.c +++ b/mysys/my_symlink.c @@ -149,9 +149,7 @@ int my_realpath(char *to, const char *filename, myf MyFlags) DBUG_RETURN(result); #else #ifdef _WIN32 - int ret= GetFullPathName(filename,FN_REFLEN,
- to,
- NULL); + int ret= GetFullPathName(filename,FN_REFLEN, to, NULL); if (ret == 0 || ret > FN_REFLEN) { if (ret > FN_REFLEN) @@ -160,7 +158,7 @@ int my_realpath(char *to, const char *filename, myf MyFlags) my_errno= EACCES; if (MyFlags & MY_WME) my_error(EE_REALPATH, MYF(0), filename, my_errno); - return -1; + return -1; } #else my_load_path(to, filename, NullS); |