diff options
| author | monty@narttu.mysql.fi <> | 2003-05-15 17:50:57 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-05-15 17:50:57 +0300 |
| commit | e2fc4f0b7158dd7f0c0ee85f9fbc18407f79df69 (patch) | |
| tree | d3b62b3ee37be2ecb2a5fceeed86d202a191a8f8 | |
| parent | 836216f4df18fa001836f6d35c141476bf36aa38 (diff) | |
| download | mariadb-git-e2fc4f0b7158dd7f0c0ee85f9fbc18407f79df69.tar.gz | |
Fix to get thread_test to compile
| -rw-r--r-- | .bzrignore | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/thread_test.c | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 82cde49001c..18ad5e18be6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -607,3 +607,7 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl +client_test +thread_test +select_test +insert_test diff --git a/tests/Makefile.am b/tests/Makefile.am index 989ddbb02eb..5d6e6a68ae2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -40,6 +40,9 @@ client_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) insert_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 $(COMPILE) -c @MT_INCLUDES@ $(INCLUDES) $< diff --git a/tests/thread_test.c b/tests/thread_test.c index 2900ab712e2..c201cbb9b83 100644 --- a/tests/thread_test.c +++ b/tests/thread_test.c @@ -39,9 +39,9 @@ static char *database,*host,*user,*password,*unix_socket,*query; uint tcp_port; #ifndef __WIN__ -void *test_thread(void *arg) +void *test_thread(void *arg __attribute__((unused))) #else -unsigned __stdcall test_thread(void *arg) +unsigned __stdcall test_thread(void *arg __attribute__((unused))) #endif { MYSQL *mysql; @@ -186,7 +186,8 @@ int main(int argc, char **argv) { pthread_t tid; pthread_attr_t thr_attr; - int i,error; + uint i; + int error; MY_INIT(argv[0]); get_options(argc,argv); |