#At lp:maria
2775 [email protected] 2009-11-26
After-merge fix for MySQL 5.1.41 merge into MariaDB: Fix incorrect merge
breaking the build.
modified:
unittest/mysys/Makefile.am
=== modified file 'unittest/mysys/Makefile.am'
--- a/unittest/mysys/Makefile.am 2009-11-16 20:49:51 +0000
+++ b/unittest/mysys/Makefile.am 2009-11-26 08:44:38 +0000
@@ -18,15 +18,13 @@ INCLUDES = @ZLIB_INCLUDES@ -I$(top_buil
noinst_HEADERS = thr_template.c
-noinst_PROGRAMS = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t
-
LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/strings/libmystrings.a
EXTRA_DIST = CMakeLists.txt
-noinst_PROGRAMS = bitmap-t base64-t
+noinst_PROGRAMS = bitmap-t base64-t lf-t waiting_threads-t
if NEED_THREAD
# my_atomic-t is used to check thread functions, so it is safe to
_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
