Merge mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

BUILD/compile-pentium-max

@@ -9,6 +9,6 @@ extra_configs="$pentium_configs"
 
 extra_configs="$extra_configs --with-innodb --with-berkeley-db \
 	--with-embedded-server --enable-thread-safe-client \
-	--with-openssl --with-vio --with-raid"
+	--with-openssl --with-vio --with-raid --with-ndbcluster"
 
 . "$path/FINISH.sh"

include/mysql_embed.h

@@ -26,6 +26,7 @@
 #undef HAVE_OPENSSL
 #undef HAVE_ISAM
 #undef HAVE_SMEM				/* No shared memory */
+#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */
 
 #define DONT_USE_RAID
 

libmysqld/Makefile.am

@@ -26,7 +26,7 @@ DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
-INCLUDES=		@MT_INCLUDES@ @ndbcluster_includes@ @bdb_includes@ -I$(top_srcdir)/include \
+INCLUDES=		@MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \
 			-I$(top_srcdir)/sql -I$(top_srcdir)/regex \
 			$(openssl_includes)
 
@@ -70,7 +70,7 @@ INC_LIB=	$(top_builddir)/regex/libregex.a \
 		$(top_builddir)/myisam/libmyisam.a \
 		$(top_builddir)/myisammrg/libmyisammrg.a \
 		$(top_builddir)/heap/libheap.a \
-		@ndbcluster_libs@ @innodb_libs@ @bdb_libs_with_path@ \
+		@innodb_libs@ @bdb_libs_with_path@ \
 		$(top_builddir)/mysys/libmysys.a \
 		$(top_builddir)/strings/libmystrings.a \
 		$(top_builddir)/dbug/libdbug.a \