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

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 \

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)

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 \