diff options
author | Marc Alff <marc.alff@sun.com> | 2009-09-22 09:22:22 -0600 |
---|---|---|
committer | Marc Alff <marc.alff@sun.com> | 2009-09-22 09:22:22 -0600 |
commit | 1ecaf1bc1e589a7246b2a4c18490ecf96209154e (patch) | |
tree | f50d0786b7febfa78df5449712a9ae6295382d08 /storage | |
parent | 4fa77f94b69c8f4f6f5173e22a9fd8b39e031908 (diff) | |
parent | 3b494279bb5612663bcced12d728dac5fb07f384 (diff) | |
download | mariadb-git-1ecaf1bc1e589a7246b2a4c18490ecf96209154e.tar.gz |
Merge mysql-next-mr (revno 2882) --> mysql-trunk-signal
Diffstat (limited to 'storage')
-rw-r--r-- | storage/ndb/test/run-test/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am index 65aa62d11f0..54ca0c009b2 100644 --- a/storage/ndb/test/run-test/Makefile.am +++ b/storage/ndb/test/run-test/Makefile.am @@ -13,7 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -testdir=$(prefix)/mysql-test/ndb +testroot=$(prefix) +testdir=$(testroot)/mysql-test/ndb include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/type_util.mk.am |