diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-20 15:25:02 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-20 15:25:02 +0300 |
| commit | 950df73713d6eca34de8be1f9771d40a8abeadc4 (patch) | |
| tree | 7eee86ca5c680d305ade1203f3945cee038dbd46 /sql/mini_client.cc | |
| parent | ccf18acc242f33fffca016c1e28c99e6e4e443b7 (diff) | |
| download | mariadb-git-950df73713d6eca34de8be1f9771d40a8abeadc4.tar.gz | |
Fixed some bugs after last merge
Added semaphore support to MIT-pthreads.
Docs/manual.texi:
Updated benchmark data
configure.in:
Portability fix for compiling MIT-pthreads with gcc 3.0.x
(Still not perfect)
include/my_semaphore.h:
Cleanup
mit-pthreads/Changes-mysql:
Added semaphore support
mit-pthreads/include/Makefile.inc:
Added semaphore support
mit-pthreads/include/pthread/ac-types.h:
Added semaphore support
mit-pthreads/pthreads/GNUmakefile.inc:
Added semaphore support
mit-pthreads/pthreads/Makefile.inc:
Added semaphore support
mit-pthreads/stdio/xprintf.c:
Added semaphore support
mysql-test/r/rpl_alter.result:
Fixed test results after merge with 3.23
sql/ha_isam.cc:
Fixed core dump after merge
sql/ha_isam.h:
Fixed core dump after merge
sql/mini_client.cc:
P
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 19e94054272..f8c930a2154 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -27,13 +27,12 @@ #define net_write_timeout net_write_timeout1 #endif -#if defined(__WIN__) -#include <winsock.h> -#include <odbcinst.h> /* QQ: Is this really needed ? */ -#define DONT_USE_THR_ALARM -#endif - #include <my_global.h> +/* my_pthread must be included early to be able to fix things */ +#if defined(THREAD) +#include <my_pthread.h> /* because of signal() */ +#endif +#include <thr_alarm.h> #include <mysql_embed.h> #include <mysql_com.h> #include <violite.h> @@ -75,10 +74,6 @@ extern "C" { // Because of SCO 3.2V4.2 #ifdef HAVE_SYS_UN_H # include <sys/un.h> #endif -#if defined(THREAD) -#include <my_pthread.h> /* because of signal() */ -#endif -#include <thr_alarm.h> #ifndef INADDR_NONE #define INADDR_NONE -1 #endif |