diff options
| author | unknown <kent/mysqldev@mysql.com/production.mysql.com> | 2008-04-02 22:24:53 +0200 |
|---|---|---|
| committer | unknown <kent/mysqldev@mysql.com/production.mysql.com> | 2008-04-02 22:24:53 +0200 |
| commit | e12312d82122cdd3743d05a12015385dd79348b6 (patch) | |
| tree | da8d71bcdb0edc87f55864a811eb1fd8f6490de6 | |
| parent | 60e5661361070701b374b7e48229b7b3f07492b2 (diff) | |
| download | mariadb-git-e12312d82122cdd3743d05a12015385dd79348b6.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()
Makefile.am:
Only run cluster test when compiled with cluster
libmysqld/lib_sql.cc:
Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
support-files/mysql.spec.sh:
If excluding Federated, make sure dynamic plugin is not built
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 4 |
3 files changed, 18 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 \ diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index ec9356ce98d..0f0fb2c1bda 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1124,6 +1124,9 @@ bool Protocol::net_store_data(const uchar *from, size_t length) return FALSE; } +#if defined(_MSC_VER) && _MSC_VER < 1400 +#define vsnprintf _vsnprintf +#endif int vprint_msg_to_log(enum loglevel level __attribute__((unused)), const char *format, va_list argsi) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index f26a922dbc3..7f7674eefc9 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -336,6 +336,8 @@ BuildMySQL "--enable-shared \ --with-innodb \ %if %{CLUSTER_BUILD} --with-ndbcluster \ +%else + --without-ndbcluster \ %endif --with-archive-storage-engine \ --with-csv-storage-engine \ @@ -343,6 +345,8 @@ BuildMySQL "--enable-shared \ --with-blackhole-storage-engine \ %if %{FEDERATED_BUILD} --with-federated-storage-engine \ +%else + --without-federated-storage-engine \ %endif --with-partition \ --with-big-tables \ |