diff options
author | Joerg Bruehe <joerg@mysql.com> | 2009-07-16 09:13:19 +0200 |
---|---|---|
committer | Joerg Bruehe <joerg@mysql.com> | 2009-07-16 09:13:19 +0200 |
commit | d1a60f9f88da0565989bca12f24dc4035a2e5980 (patch) | |
tree | 1ca4e7453129b5d419eca1167a4e0db6ed6466c0 /tests | |
parent | 8c68b49c220cc163004620f40a8413cf6cf9682a (diff) | |
parent | 7703b64bfb06fe4976e961aff39cb7f842b456c2 (diff) | |
download | mariadb-git-d1a60f9f88da0565989bca12f24dc4035a2e5980.tar.gz |
Merge main 5.1 into 5.1-build.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index fbd58b88b9c..ddc6da86e1c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,7 +56,7 @@ bug25714_SOURCES= bug25714.c bug25714_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) # Fix for mit-threads -DEFS = -DUNDEF_THREADS_HACK +DEFS = -DMYSQL_CLIENT_NO_THREADS thread_test.o: thread_test.c $(COMPILE) -c $(INCLUDES) $< |