diff options
| author | Magnus Svensson <msvensson@mysql.com> | 2008-06-16 11:21:30 +0200 |
|---|---|---|
| committer | Magnus Svensson <msvensson@mysql.com> | 2008-06-16 11:21:30 +0200 |
| commit | ec4a4dd64aeebfd369e2071d7da90a837a7638de (patch) | |
| tree | d64cd0d0aa830ec2b2b6bab65837a029878d5ef8 | |
| parent | 867b60e08be9887aa6b7a61b763f44edcca1c221 (diff) | |
| download | mariadb-git-ec4a4dd64aeebfd369e2071d7da90a837a7638de.tar.gz | |
WL#4189
- Fix make_binary_distribution.sh after removing mysql-test/ndb dir
| -rw-r--r-- | mysql-test/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 31804714900..6e706ba022e 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -60,7 +60,7 @@ TEST_DIRS = t r include std_data std_data/parts \ suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \ suite/bugs/data suite/bugs/t suite/bugs/r \ suite/federated \ - suite/funcs_1 suite/funcs_1/bitdata suite/funcs_1/data \ + suite/funcs_1 suite/funcs_1/bitdata \ suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \ suite/funcs_1/t suite/funcs_1/views suite/funcs_1/cursors \ suite/funcs_1/datadict suite/funcs_1/storedproc suite/funcs_1/triggers \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 50cff8578c9..89ce40a891c 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -369,13 +369,12 @@ fi # NDB Cluster if [ x$NDBCLUSTER = x1 ]; then ( cd ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install ) - ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install ) $CP $BASE/ndb-stage@bindir@/* $BASE/bin/. $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/. $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/. $CP $BASE/ndb-stage@pkgdatadir@/* $BASE/share/mysql/. $CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include - $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1 + $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. rm -rf $BASE/ndb-stage fi |