summaryrefslogtreecommitdiff
path: root/storage/ndb
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-09-19 13:07:51 +0400
committerAlexander Nozdrin <alik@sun.com>2009-09-19 13:07:51 +0400
commitede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5 (patch)
tree46e87f02d924b89bde60832867a57dd1b082b48a /storage/ndb
parente60ff2b6a30f207f18760ca9a0de444110e800f5 (diff)
parent19d0529819c65dc4662b6a388fea7fbc7323b2f1 (diff)
downloadmariadb-git-ede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5.tar.gz
Merge from mysql-5.1.
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