Commit e2fc4f0b authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Fix to get thread_test to compile

parent 836216f4
...@@ -607,3 +607,7 @@ vio/test-ssl ...@@ -607,3 +607,7 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
client_test
thread_test
select_test
insert_test
...@@ -40,6 +40,9 @@ client_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) ...@@ -40,6 +40,9 @@ client_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
# Fix for mit-threads
DEFS = -DUNDEF_THREADS_HACK
thread_test.o: thread_test.c thread_test.o: thread_test.c
$(COMPILE) -c @MT_INCLUDES@ $(INCLUDES) $< $(COMPILE) -c @MT_INCLUDES@ $(INCLUDES) $<
......
...@@ -39,9 +39,9 @@ static char *database,*host,*user,*password,*unix_socket,*query; ...@@ -39,9 +39,9 @@ static char *database,*host,*user,*password,*unix_socket,*query;
uint tcp_port; uint tcp_port;
#ifndef __WIN__ #ifndef __WIN__
void *test_thread(void *arg) void *test_thread(void *arg __attribute__((unused)))
#else #else
unsigned __stdcall test_thread(void *arg) unsigned __stdcall test_thread(void *arg __attribute__((unused)))
#endif #endif
{ {
MYSQL *mysql; MYSQL *mysql;
...@@ -186,7 +186,8 @@ int main(int argc, char **argv) ...@@ -186,7 +186,8 @@ int main(int argc, char **argv)
{ {
pthread_t tid; pthread_t tid;
pthread_attr_t thr_attr; pthread_attr_t thr_attr;
int i,error; uint i;
int error;
MY_INIT(argv[0]); MY_INIT(argv[0]);
get_options(argc,argv); get_options(argc,argv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment