database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2006-06-07 12:05:42 +02:00
parent 8e87d3be42 49cf54d1c9
commit 6ce84f2209
13 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/config-win.h
View File

@ -29,7 +29,6 @@ functions */
#include <sys/locking.h> #include <sys/locking.h>
#include <windows.h> #include <windows.h>
#include <math.h> /* Because of rint() */
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>
#include <malloc.h> #include <malloc.h>
@ -222,17 +221,9 @@ typedef uint rf_SetTimer;
#define inline __inline #define inline __inline
#endif /* __cplusplus */ #endif /* __cplusplus */
inline double rint(double nr)
{
double f = floor(nr);
double c = ceil(nr);
return (((c-nr) >= (nr-f)) ? f :c);
}
#ifdef _WIN64 #ifdef _WIN64
#define ulonglong2double(A) ((double) (ulonglong) (A)) #define ulonglong2double(A) ((double) (ulonglong) (A))
#define my_off_t2double(A) ((double) (my_off_t) (A)) #define my_off_t2double(A) ((double) (my_off_t) (A))
#else #else
inline double ulonglong2double(ulonglong value) inline double ulonglong2double(ulonglong value)
{ {
@ -338,7 +329,6 @@ inline double ulonglong2double(ulonglong value)
#define HAVE_FLOAT_H #define HAVE_FLOAT_H
#define HAVE_LIMITS_H #define HAVE_LIMITS_H
#define HAVE_STDDEF_H #define HAVE_STDDEF_H
#define HAVE_RINT /* defined in this file */
#define NO_FCNTL_NONBLOCK /* No FCNTL */ #define NO_FCNTL_NONBLOCK /* No FCNTL */
#define HAVE_ALLOCA #define HAVE_ALLOCA
#define HAVE_STRPBRK #define HAVE_STRPBRK

1
include/my_base.h
View File

@ -21,7 +21,6 @@
#define _my_base_h #define _my_base_h
#ifndef stdin /* Included first in handler */ #ifndef stdin /* Included first in handler */
#define USES_TYPES /* my_dir with sys/types is included */
#define CHSIZE_USED #define CHSIZE_USED
#include <my_global.h> #include <my_global.h>
#include <my_dir.h> /* This includes types */ #include <my_dir.h> /* This includes types */

1
mysys/my_append.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES /* sys/types is included */
#include "mysys_priv.h" #include "mysys_priv.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <m_string.h> #include <m_string.h>

1
mysys/my_clock.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES
#include "my_global.h" #include "my_global.h"
#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__) #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__)

1
mysys/my_copy.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES /* sys/types is included */
#include "mysys_priv.h" #include "mysys_priv.h"
#include <my_dir.h> /* for stat */ #include <my_dir.h> /* for stat */
#include <m_string.h> #include <m_string.h>

1
mysys/my_create.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES
#include "mysys_priv.h" #include "mysys_priv.h"
#include <my_dir.h> #include <my_dir.h>
#include "mysys_err.h" #include "mysys_err.h"

1
mysys/my_dup.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES
#include "mysys_priv.h" #include "mysys_priv.h"
#include "mysys_err.h" #include "mysys_err.h"
#include <my_dir.h> #include <my_dir.h>

1
mysys/my_lib.c
View File

@ -17,7 +17,6 @@
/* TODO: check for overun of memory for names. */ /* TODO: check for overun of memory for names. */
/* Convert MSDOS-TIME to standar time_t */ /* Convert MSDOS-TIME to standar time_t */
#define USES_TYPES /* sys/types is included */
#include "mysys_priv.h" #include "mysys_priv.h"
#include <m_string.h> #include <m_string.h>
#include <my_dir.h> /* Structs used by my_dir,includes sys/types */ #include <my_dir.h> /* Structs used by my_dir,includes sys/types */

1
mysys/my_open.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES
#include "mysys_priv.h" #include "mysys_priv.h"
#include "mysys_err.h" #include "mysys_err.h"
#include <my_dir.h> #include <my_dir.h>

1
mysys/my_redel.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES /* sys/types is included */
#include "mysys_priv.h" #include "mysys_priv.h"
#include <my_dir.h> #include <my_dir.h>
#include <m_string.h> #include <m_string.h>

1
mysys/my_rename.c
View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES
#include "mysys_priv.h" #include "mysys_priv.h"
#include <my_dir.h> #include <my_dir.h>
#include "mysys_err.h" #include "mysys_err.h"

1
mysys/test_dir.c
View File

@ -16,7 +16,6 @@
/* TODO: Test all functions */ /* TODO: Test all functions */
#define USES_TYPES
#include "mysys_priv.h" #include "mysys_priv.h"
#include "my_dir.h" #include "my_dir.h"

1
sql/unireg.cc
View File

@ -24,7 +24,6 @@
str is a (long) to record position where 0 is the first position. str is a (long) to record position where 0 is the first position.
*/ */
#define USES_TYPES
#include "mysql_priv.h" #include "mysql_priv.h"
#include <m_ctype.h> #include <m_ctype.h>
#include <assert.h> #include <assert.h>