Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


client/mysql.cc:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysys/my_open.c:
  Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/time.cc:
  Auto merged
client/mysqltest.c:
  Manual merge.
mysql-test/r/ps_1general.result:
  Manual merge.

1 files changed, 2 insertions, 2 deletions

diff --git a/mysys/my_open.c b/mysys/my_open.c
index 6e57132ae23..ab2f7c9ff27 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -334,7 +334,7 @@ File my_sopen(const char *path, int oflag, int shflag, int pmode)
    * try to open/create the file
    */
   if ((osfh= CreateFile(path, fileaccess, fileshare, &SecurityAttributes, 
-                        filecreate, fileattrib, NULL)) == (HANDLE)0xffffffff)
+                        filecreate, fileattrib, NULL)) == INVALID_HANDLE_VALUE)
   {
     /*
      * OS call to open/create file failed! map the error, release
@@ -345,7 +345,7 @@ File my_sopen(const char *path, int oflag, int shflag, int pmode)
     return -1;                      /* return error to caller */
   }
 
-  fh= _open_osfhandle((long)osfh, oflag & (_O_APPEND | _O_RDONLY | _O_TEXT));
+  fh= _open_osfhandle((intptr_t)osfh, oflag & (_O_APPEND | _O_RDONLY | _O_TEXT));
 
   return fh;                        /* return handle */
 }