bk commit into 5.0 tree (msvensson:1.2457)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-04-24 13:59:44+02:00, msvensson@stripped +2 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.2425.37.1

  include/my_global.h@stripped, 2007-04-24 13:59:42+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.137.1.2

  include/my_sys.h@stripped, 2007-04-24 13:59:42+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.194.1.1

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.195/include/my_sys.h	2007-03-28 18:01:07 +02:00
+++ 1.196/include/my_sys.h	2007-04-24 13:59:42 +02:00
@@ -31,10 +31,7 @@ extern int NEAR my_errno;		/* Last error
 #include <my_pthread.h>
 #endif
 
-#ifndef _m_ctype_h
 #include <m_ctype.h>                    /* for CHARSET_INFO */
-#endif
-
 #include <stdarg.h>
 #include <typelib.h>
 

--- 1.138/include/my_global.h	2007-04-12 00:43:24 +02:00
+++ 1.139/include/my_global.h	2007-04-24 13:59:42 +02:00
@@ -86,6 +86,14 @@
 #endif
 #endif /* _WIN32... */
 
+/* Make it easier to add conditionl code for windows */
+#ifdef __WIN__
+#define IF_WIN(A,B) (A)
+#else
+#define IF_WIN(A,B) (B)
+#endif
+
+
 /* Some defines to avoid ifdefs in the code */
 #ifndef NETWARE_YIELD
 #define NETWARE_YIELD
@@ -776,7 +784,12 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define SSIZE_MAX ((~((size_t) 0)) / 2)
 #endif
 
-#if !defined(HAVE_ISINF) && !defined(isinf)
+#if !defined(HAVE_ISINF)
+/* The configure check for "isinf with math.h" has failed */
+#ifdef isinf
+#undef isinf
+#endif
+/* Define isinf to never say that X is infinite */
 #define isinf(X)    0
 #endif