diff options
| author | kent/mysqldev@mysql.com/production.mysql.com <> | 2008-04-02 22:24:53 +0200 |
|---|---|---|
| committer | kent/mysqldev@mysql.com/production.mysql.com <> | 2008-04-02 22:24:53 +0200 |
| commit | c41a4e13f82461b4b0944998556748e3fb59ef45 (patch) | |
| tree | da8d71bcdb0edc87f55864a811eb1fd8f6490de6 /Makefile.am | |
| parent | fd1bd7547a60d9f1c4ba8ddd997572a77d166345 (diff) | |
| download | mariadb-git-c41a4e13f82461b4b0944998556748e3fb59ef45.tar.gz | |
mysql.spec.sh:
If excluding Federated, make sure dynamic plugin is not built
Makefile.am:
Only run cluster test when compiled with cluster
lib_sql.cc:
Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index ad94c9ea325..f999df86acf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,12 +135,17 @@ test-bt: -cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \ --skip-ndbcluster --mysqld=--binlog-format=row - -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \ - --ps-protocol --mysqld=--binlog-format=row - -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \ - --with-ndbcluster-only + -if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \ + cd mysql-test ; \ + MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \ + --ps-protocol --mysqld=--binlog-format=row ; \ + MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \ + --with-ndbcluster-only ; \ + else \ + echo "no program found for 'ndbcluster' tests - skipped testing" ; \ + fi -if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \ cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \ |