1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After-merge fix for MySQL 5.1.41 merge into MariaDB: Fix incorrect merge breaking the build.

Browse Source
This commit is contained in:
unknown 2009-11-26 09:44:38 +01:00
parent f92723ebc2
commit d44270afe7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/mysys/Makefile.am
View File

@ -18,15 +18,13 @@ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
noinst_HEADERS = thr_template.c 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 \ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \ $(top_builddir)/dbug/libdbug.a \
$(top_builddir)/strings/libmystrings.a $(top_builddir)/strings/libmystrings.a
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt
noinst_PROGRAMS = bitmap-t base64-t noinst_PROGRAMS = bitmap-t base64-t lf-t waiting_threads-t
if NEED_THREAD if NEED_THREAD
# my_atomic-t is used to check thread functions, so it is safe to # my_atomic-t is used to check thread functions, so it is safe to