Merge neptunus.(none):/home/msvensson/mysql/my51-bug15936

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
sql/unireg.cc:
  Auto merged

13 files changed, 0 insertions, 22 deletions

diff --git a/include/config-win.h b/include/config-win.h
index 6d0f40adbd3..c0b1101fe76 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -29,7 +29,6 @@ functions */
 
 #include <sys/locking.h>
 #include <windows.h>
-#include <math.h>			/* Because of rint() */
 #include <fcntl.h>
 #include <io.h>
 #include <malloc.h>
@@ -222,17 +221,9 @@ typedef uint rf_SetTimer;
 #define inline __inline
 #endif /* __cplusplus */
 
-inline double rint(double nr)
-{
-  double f = floor(nr);
-  double c = ceil(nr);
-  return (((c-nr) >= (nr-f)) ? f :c);
-}
-
 #ifdef _WIN64
 #define ulonglong2double(A) ((double) (ulonglong) (A))
 #define my_off_t2double(A)  ((double) (my_off_t) (A))
-
 #else
 inline double ulonglong2double(ulonglong value)
 {
@@ -338,7 +329,6 @@ inline double ulonglong2double(ulonglong value)
 #define HAVE_FLOAT_H
 #define HAVE_LIMITS_H
 #define HAVE_STDDEF_H
-#define HAVE_RINT		/* defined in this file */
 #define NO_FCNTL_NONBLOCK	/* No FCNTL */
 #define HAVE_ALLOCA
 #define HAVE_STRPBRK
diff --git a/include/my_base.h b/include/my_base.h
index 0390106880a..74dc9855a3b 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -21,7 +21,6 @@
 #define _my_base_h
 
 #ifndef stdin				/* Included first in handler */
-#define USES_TYPES			/* my_dir with sys/types is included */
 #define CHSIZE_USED
 #include <my_global.h>
 #include <my_dir.h>			/* This includes types */
diff --git a/mysys/my_append.c b/mysys/my_append.c
index c3549c670c3..6d52c03c6cc 100644
--- a/mysys/my_append.c
+++ b/mysys/my_append.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES				/* sys/types is included */
 #include "mysys_priv.h"
 #include <sys/stat.h>
 #include <m_string.h>
diff --git a/mysys/my_clock.c b/mysys/my_clock.c
index 384239bb2b2..decb9902e8c 100644
--- a/mysys/my_clock.c
+++ b/mysys/my_clock.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "my_global.h"
 
 #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__)
diff --git a/mysys/my_copy.c b/mysys/my_copy.c
index 342b1cdc104..1bf024c524f 100644
--- a/mysys/my_copy.c
+++ b/mysys/my_copy.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES				/* sys/types is included */
 #include "mysys_priv.h"
 #include <my_dir.h> /* for stat */
 #include <m_string.h>
diff --git a/mysys/my_create.c b/mysys/my_create.c
index d42e7e0db69..bb5b2f2be61 100644
--- a/mysys/my_create.c
+++ b/mysys/my_create.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include <my_dir.h>
 #include "mysys_err.h"
diff --git a/mysys/my_dup.c b/mysys/my_dup.c
index f4c420eb459..55f22931cd4 100644
--- a/mysys/my_dup.c
+++ b/mysys/my_dup.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include "mysys_err.h"
 #include <my_dir.h>
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index e96286a94a8..12cc64d0ad9 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -17,7 +17,6 @@
 /* TODO: check for overun of memory for names. */
 /*	 Convert MSDOS-TIME to standar time_t */
 
-#define USES_TYPES		/* sys/types is included */
 #include	"mysys_priv.h"
 #include	<m_string.h>
 #include	<my_dir.h>	/* Structs used by my_dir,includes sys/types */
diff --git a/mysys/my_open.c b/mysys/my_open.c
index ed323b3b1ad..b070258505a 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include "mysys_err.h"
 #include <my_dir.h>
diff --git a/mysys/my_redel.c b/mysys/my_redel.c
index 02d3db8b860..9a1149e6f88 100644
--- a/mysys/my_redel.c
+++ b/mysys/my_redel.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES				/* sys/types is included */
 #include "mysys_priv.h"
 #include <my_dir.h>
 #include <m_string.h>
diff --git a/mysys/my_rename.c b/mysys/my_rename.c
index b5d813ad787..9c27238cc72 100644
--- a/mysys/my_rename.c
+++ b/mysys/my_rename.c
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include <my_dir.h>
 #include "mysys_err.h"
diff --git a/mysys/test_dir.c b/mysys/test_dir.c
index f3d220e942f..c9693ab3c68 100644
--- a/mysys/test_dir.c
+++ b/mysys/test_dir.c
@@ -16,7 +16,6 @@
 
 /* TODO: Test all functions  */
 
-#define USES_TYPES
 #include "mysys_priv.h"
 #include "my_dir.h"
 
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 11aa73bb502..7668a4dacf1 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -24,7 +24,6 @@
     str is a (long) to record position where 0 is the first position.
 */
 
-#define USES_TYPES
 #include "mysql_priv.h"
 #include <m_ctype.h>
 #include <assert.h>