Merge with 3.23.42

7 files changed, 23 insertions, 6 deletions

diff --git a/include/config-os2.h b/include/config-os2.h
index 172a04a9f01..9064cd5a5bb 100644
--- a/include/config-os2.h
+++ b/include/config-os2.h
@@ -87,6 +87,8 @@
 #define S_IFMT		0xF000	    /* Mask for file type */
 #define F_TO_EOF	0L	    /* Param to lockf() to lock rest of file */
 
+#define HUGE_PTR
+
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -102,8 +104,13 @@ BOOL	 TlsSetValue( DWORD, PVOID);
 #define lseek(A,B,C)	_lseek64( A, B, C)
 #define tell(A)		_lseek64( A, 0, SEEK_CUR)
 
+void* dlopen( char* path, int flag);
+char* dlerror( void);
+void* dlsym( void* hmod, char* fn);
+void  dlclose( void* hmod);
+
 /* Some typedefs */
-typedef ulonglong os_off_t;
+typedef unsigned long long os_off_t;
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/include/dbug.h b/include/dbug.h
index d86b83f4de8..3c86cbb8ac2 100644
--- a/include/dbug.h
+++ b/include/dbug.h
@@ -66,7 +66,7 @@ extern	void _db_unlock_file();
 #define DEBUGGER_ON  _no_db_=0
 #define DBUG_LOCK_FILE { _db_lock_file(); }
 #define DBUG_UNLOCK_FILE { _db_unlock_file(); }
-#define DBUG_ASSERT(A) A
+#define DBUG_ASSERT(A) assert(A)
 #else						/* No debugger */
 
 #define DBUG_ENTER(a1)
diff --git a/include/global.h b/include/global.h
index 0915047fddb..7cd79b3e078 100644
--- a/include/global.h
+++ b/include/global.h
@@ -654,15 +654,24 @@ typedef off_t os_off_t;
 #define socket_errno	WSAGetLastError()
 #define SOCKET_EINTR	WSAEINTR 
 #define SOCKET_EAGAIN	WSAEINPROGRESS
+#define SOCKET_ENFILE	ENFILE
+#define SOCKET_EMFILE	EMFILE
 #elif defined(OS2)
 #define socket_errno	sock_errno()
+#define SOCKET_EINTR	SOCEINTR 
+#define SOCKET_EAGAIN	SOCEINPROGRESS
+#define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK
+#define SOCKET_ENFILE	SOCENFILE
+#define SOCKET_EMFILE	SOCEMFILE
 #define closesocket(A)	soclose(A)
 #else /* Unix */
-#define socket_errno errno
+#define socket_errno	errno
 #define closesocket(A)	close(A)
 #define SOCKET_EINTR	EINTR
 #define SOCKET_EAGAIN	EAGAIN
 #define SOCKET_EWOULDBLOCK EWOULDBLOCK
+#define SOCKET_ENFILE	ENFILE
+#define SOCKET_EMFILE	EMFILE
 #endif
 
 typedef uint8		int7;	/* Most effective integer 0 <= x <= 127 */
diff --git a/include/merge.h b/include/merge.h
index b090e49b471..c661e03a0c7 100644
--- a/include/merge.h
+++ b/include/merge.h
@@ -43,7 +43,7 @@ typedef struct st_mrg_info		/* Struct from h_info */
   ulonglong data_file_length;
   uint	reclength;			/* Recordlength */
   int	errkey;				/* With key was dupplicated on err */
-  uint	options;			/* HA_OPTIONS_... used */
+  uint	options;			/* HA_OPTION_... used */
 } MERGE_INFO;
 
 typedef struct st_mrg_table_info
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 14ccd93a96c..577d3dea3b2 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -139,6 +139,7 @@ int pthread_mutex_unlock (pthread_mutex_t *);
 int pthread_mutex_destroy (pthread_mutex_t *);
 #define my_pthread_setprio(A,B)  DosSetPriority(PRTYS_THREAD,PRTYC_NOCHANGE, B, A)
 #define pthread_kill(A,B) raise(B)
+#define pthread_exit(A) pthread_dummy()
 #else
 #define pthread_mutex_init(A,B)  InitializeCriticalSection(A)
 #define pthread_mutex_lock(A)	 (EnterCriticalSection(A),0)
diff --git a/include/myisam.h b/include/myisam.h
index d2cf3822575..1752f9336a5 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -70,7 +70,7 @@ typedef struct st_mi_isaminfo		/* Struct from h_info */
   ulonglong key_map;			/* Which keys are used */
   char  *data_file_name, *index_file_name;
   uint  keys;				/* Number of keys in use */
-  uint	options;			/* HA_OPTIONS_... used */
+  uint	options;			/* HA_OPTION_... used */
   int	errkey,				/* With key was dupplicated on err */
 	sortkey;			/* clustered by this key */
   File	filenr;				/* (uniq) filenr for datafile */
diff --git a/include/nisam.h b/include/nisam.h
index 77ca12bbc5c..7ce2b44ee79 100644
--- a/include/nisam.h
+++ b/include/nisam.h
@@ -57,7 +57,7 @@ typedef struct st_n_isaminfo		/* Struct from h_info */
   uint	reclength;			/* Recordlength */
   uint	mean_reclength;			/* Mean recordlength (if packed) */
   uint	keys;				/* How many keys used */
-  uint	options;			/* HA_OPTIONS_... used */
+  uint	options;			/* HA_OPTION_... used */
   int	errkey,				/* With key was dupplicated on err */
 	sortkey;			/* clustered by this key */
   File	filenr;				/* (uniq) filenr for datafile */