summaryrefslogtreecommitdiff
path: root/storage/ndb
diff options
context:
space:
mode:
authorJonathan Perkin <jperkin@sun.com>2009-09-03 01:48:06 +0200
committerJonathan Perkin <jperkin@sun.com>2009-09-03 01:48:06 +0200
commit0644b0acfa43206cd87270557b041f921fa92f02 (patch)
treeb01af07a6a5a0b7f510e606c065e77952a6c015a /storage/ndb
parent41427950ed8bf62628d99936686d1f2db0528336 (diff)
parent71f4bfd6c7dba0ea4b00469d48e458f0e5eeaf67 (diff)
downloadmariadb-git-0644b0acfa43206cd87270557b041f921fa92f02.tar.gz
Merge from mysql-5.1.38-release
Diffstat (limited to 'storage/ndb')
-rw-r--r--storage/ndb/test/run-test/Makefile.am3
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