Skip to content

M
MariaDB
Commit 1bb6196e authored by unknown's avatar unknown
Browse files
Options

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 

into  gbichot4.local:/home/mysql_src/mysql-maria-monty
parents 4ab90ef2 29ee9e6f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
storage/maria/unittest/Makefile.am
View file @ 1bb6196e
...@@ -18,7 +18,8 @@ AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ ...@@ -18,7 +18,8 @@ AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
EXTRA_DIST = CMakeLists.txt EXTRA_DIST= ma_test_all-t CMakeLists.txt \
ma_test_recovery.pl ma_test_recovery.expected
# Only reason to link with libmyisam.a here is that it's where some fulltext # Only reason to link with libmyisam.a here is that it's where some fulltext
# pieces are (but soon we'll remove fulltext dependencies from Maria). # pieces are (but soon we'll remove fulltext dependencies from Maria).
LDADD= $(top_builddir)/unittest/mytap/libmytap.a \ LDADD= $(top_builddir)/unittest/mytap/libmytap.a \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7