database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysql.spec.sh:

Browse Source 
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()
This commit is contained in:
kent/mysqldev@mysql.com/production.mysql.com
2008-04-02 22:24:53 +02:00
parent fd1bd7547a
commit c41a4e13f8
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.am
View File

@ -135,12 +135,17 @@ test-bt:
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \ @PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \
--skip-ndbcluster --mysqld=--binlog-format=row --skip-ndbcluster --mysqld=--binlog-format=row
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
@PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \ cd mysql-test ; \
--ps-protocol --mysqld=--binlog-format=row MTR_BUILD_THREAD=auto \
-cd mysql-test ; MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \
@PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \ --ps-protocol --mysqld=--binlog-format=row ; \
--with-ndbcluster-only 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 \ -if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \ cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \ @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \

3
libmysqld/lib_sql.cc
View File

@ -1124,6 +1124,9 @@ bool Protocol::net_store_data(const uchar *from, size_t length)
return FALSE; return FALSE;
} }
#if defined(_MSC_VER) && _MSC_VER < 1400
#define vsnprintf _vsnprintf
#endif
int vprint_msg_to_log(enum loglevel level __attribute__((unused)), int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
const char *format, va_list argsi) const char *format, va_list argsi)

4
support-files/mysql.spec.sh
View File

@ -336,6 +336,8 @@ BuildMySQL "--enable-shared \
--with-innodb \ --with-innodb \
%if %{CLUSTER_BUILD} %if %{CLUSTER_BUILD}
--with-ndbcluster \ --with-ndbcluster \
%else
--without-ndbcluster \
%endif %endif
--with-archive-storage-engine \ --with-archive-storage-engine \
--with-csv-storage-engine \ --with-csv-storage-engine \
@ -343,6 +345,8 @@ BuildMySQL "--enable-shared \
--with-blackhole-storage-engine \ --with-blackhole-storage-engine \
%if %{FEDERATED_BUILD} %if %{FEDERATED_BUILD}
--with-federated-storage-engine \ --with-federated-storage-engine \
%else
--without-federated-storage-engine \
%endif %endif
--with-partition \ --with-partition \
--with-big-tables \ --with-big-tables \