bk commit into 5.1 tree (iggy:1.2458)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-07 10:51:25-05:00, iggy@recycle.(none) +1 -0
  Merge recycle.(none):/src/bug25222/my50-bug25222
  into  recycle.(none):/src/bug25222/my51-bug25222
  MERGE: 1.1810.2372.145

  mysys/my_open.c@stripped, 2007-03-07 10:51:21-05:00, iggy@recycle.(none) +0 -0
    Auto merged
    MERGE: 1.25.3.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	recycle.(none)
# Root:	/src/bug25222/my51-bug25222/RESYNC

--- 1.31/mysys/my_open.c	2006-12-23 14:19:46 -05:00
+++ 1.32/mysys/my_open.c	2007-03-07 10:51:21 -05:00
@@ -352,7 +352,12 @@
     return -1;                      /* return error to caller */
   }
 
-  fh= _open_osfhandle((intptr_t)osfh, oflag & (_O_APPEND | _O_RDONLY | _O_TEXT));
+  if ((fh= _open_osfhandle((intptr_t)osfh, 
+                           oflag & (_O_APPEND | _O_RDONLY | _O_TEXT))) == -1)
+  {
+    _dosmaperr(GetLastError());     /* map error */
+    CloseHandle(osfh);
+  }
 
   return fh;                        /* return handle */
 }