Commit f2e9dc6b authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi

Merge mashka.mysql.fi:/home/my/mysql-3.23

into mashka.mysql.fi:/home/my/mysql-4.0
parents 15b870d6 70b97a98
...@@ -45,6 +45,13 @@ int my_rename(const char *from, const char *to, myf MyFlags) ...@@ -45,6 +45,13 @@ int my_rename(const char *from, const char *to, myf MyFlags)
} }
#endif #endif
#if defined(HAVE_RENAME) #if defined(HAVE_RENAME)
#ifdef __WIN__
/*
On windows we can't rename over an existing file:
Remove any conflicting files:
*/
(void) my_delete(to, MYF(0));
#endif
if (rename(from,to)) if (rename(from,to))
#else #else
if (link(from, to) || unlink(from)) if (link(from, to) || unlink(from))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment