Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1

1 files changed, 5 insertions, 2 deletions

diff --git a/bdb/os_win32/os_rename.c b/bdb/os_win32/os_rename.c
index ba14cb73bb0..67c3846649b 100644
--- a/bdb/os_win32/os_rename.c
+++ b/bdb/os_win32/os_rename.c
@@ -47,8 +47,11 @@ __os_rename(dbenv, oldname, newname, flags)
 			 * There is no MoveFileEx for Win9x/Me, so we have to
 			 * do the best we can.
 			 */
-			if (!GetLongPathName(oldname, oldbuf, sizeof oldbuf) ||
-			    !GetLongPathName(newname, newbuf, sizeof newbuf)) {
+			LPTSTR FilePath;
+			if (!GetFullPathName(oldname, sizeof(oldbuf), oldbuf,
+					     &FilePath) ||
+			    !GetFullPathName(newname, sizeof(newbuf), newbuf,
+					     &FilePath)) {
 				ret = __os_win32_errno();
 				goto done;
 			}