summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-05-15 17:50:57 +0300
committerunknown <monty@narttu.mysql.fi>2003-05-15 17:50:57 +0300
commit8178016caee8c98f017a8b8ce1b79802ce3c8231 (patch)
treed3b62b3ee37be2ecb2a5fceeed86d202a191a8f8 /tests
parentdf9068e35a356b657c6f70c0d8563d3ddae5304c (diff)
downloadmariadb-git-8178016caee8c98f017a8b8ce1b79802ce3c8231.tar.gz
Fix to get thread_test to compile
BitKeeper/etc/ignore: added insert_test tests/thread_test.c: Remove compiler warnings
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am3
-rw-r--r--tests/thread_test.c7
2 files changed, 7 insertions, 3 deletions
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);