Commit 4f908f24 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  big_geek.:C:/Work/mysql/mysql-5.1


include/config-win.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_tree.h:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_access.c:
  adjusted defines from merge
parents 94c6f6dc ec824329

include/config-win.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ functions */ 
#define O_SHORT_LIVED	0

#define SH_DENYNO	_SH_DENYNO

#else

#define O_BINARY	_O_BINARY	/* compability with MSDOS */

#define O_BINARY	_O_BINARY	/* compability with older style names */

#define FILE_BINARY	_O_BINARY	/* my_fopen in binary mode */

#define O_TEMPORARY	_O_TEMPORARY

#define O_SHORT_LIVED	_O_SHORT_LIVED

include/m_string.h

+0 −6
Original line number Diff line number Diff line
@@ -106,12 +106,6 @@ extern char NEAR _dig_vec_lower[]; 
#define memcpy_fixed(A,B,C) memcpy((A),(B),(C))

#endif



#ifdef MSDOS

#undef bmove_align

#define bmove512(A,B,C) bmove_align(A,B,C)

extern	void bmove_align(gptr dst,const gptr src,uint len);

#endif



#if (!defined(USE_BMOVE512) || defined(HAVE_purify)) && !defined(bmove512)

#define bmove512(A,B,C) memcpy(A,B,C)

#endif

include/my_base.h

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
#define EOVERFLOW 84

#endif



#ifdef MSDOS

#include <share.h>			/* Neaded for sopen() */

#endif

#if !defined(USE_MY_FUNC) && !defined(THREAD)

#include <my_nosys.h>			/* For faster code, after test */

#endif	/* USE_MY_FUNC */

include/my_net.h

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ C_MODE_START 
#include <sys/ioctl.h>

#endif



#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__)

#if !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__)

#include <netinet/in_systm.h>

#include <netinet/in.h>

#include <netinet/ip.h>
@@ -53,7 +53,7 @@ C_MODE_START 
#endif

#endif



#if defined(MSDOS) || defined(__WIN__)

#if defined(__WIN__)

#define O_NONBLOCK 1    /* For emulation of fcntl() */

#endif

include/my_nosys.h

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ extern "C" { 
#ifndef __MY_NOSYS__

#define __MY_NOSYS__



#ifdef MSDOS

#include <io.h>			/* Get prototypes for read()... */

#endif

#ifndef HAVE_STDLIB_H

#include <malloc.h>

#endif