bk commit into 5.1 tree (kent:1.2565)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent.  When kent does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-02 22:24:53+02:00, kent@stripped +3 -0
  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@stripped, 2008-04-02 20:59:31+02:00, kent@stripped +11 -6
    Only run cluster test when compiled with cluster

  libmysqld/lib_sql.cc@stripped, 2008-04-02 21:00:00+02:00, kent@stripped +3 -0
    Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()

  support-files/mysql.spec.sh@stripped, 2008-04-02 21:00:40+02:00, kent@stripped +4 -0
    If excluding Federated, make sure dynamic plugin is not built

diff -Nrup a/Makefile.am b/Makefile.am
--- a/Makefile.am	2007-12-11 21:07:40 +01:00
+++ b/Makefile.am	2008-04-02 20:59:31 +02:00
@@ -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 -Nrup a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
--- a/libmysqld/lib_sql.cc	2008-03-12 09:13:18 +01:00
+++ b/libmysqld/lib_sql.cc	2008-04-02 21:00:00 +02:00
@@ -1124,6 +1124,9 @@ bool Protocol::net_store_data(const ucha
   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 -Nrup a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
--- a/support-files/mysql.spec.sh	2008-03-31 19:48:39 +02:00
+++ b/support-files/mysql.spec.sh	2008-04-02 21:00:40 +02:00
@@ -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 \