From d44270afe7d0d7ff85c55b748a50b41f26612a44 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Nov 2009 09:44:38 +0100 Subject: [PATCH] After-merge fix for MySQL 5.1.41 merge into MariaDB: Fix incorrect merge breaking the build. --- unittest/mysys/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am index 5ceae438aa2..7fb487ffabf 100644 --- a/unittest/mysys/Makefile.am +++ b/unittest/mysys/Makefile.am @@ -18,15 +18,13 @@ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ 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