diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:12:51 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:12:51 +0200 |
| commit | 2a4c97fc3eb90c49f81219183dd6d9b998df3077 (patch) | |
| tree | a6b1bc74538540131a415155302fd9dedd4cce61 /storage/ndb | |
| parent | 85c97f96c0afc2f311ac311309975f6d806a9f44 (diff) | |
| parent | 71f4bfd6c7dba0ea4b00469d48e458f0e5eeaf67 (diff) | |
| download | mariadb-git-2a4c97fc3eb90c49f81219183dd6d9b998df3077.tar.gz | |
MySQL 5.1.38 merge into MariaDB.
Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing
from the original merge).
Diffstat (limited to 'storage/ndb')
| -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 |