Merged 5.1 with maria 5.1

5 files changed, 49 insertions, 4 deletions

diff --git a/support-files/build-tags b/support-files/build-tags
index d5f9fbf5100..6c80d2638e9 100755
--- a/support-files/build-tags
+++ b/support-files/build-tags
@@ -2,8 +2,11 @@
 
 rm -f TAGS
 filter='\.cc$\|\.c$\|\.h$\|\.yy$'
-files=`bk -r sfiles -gU | grep $filter `
-for f in $files ;
+
+list="find . -type f"
+bzr root >/dev/null 2>/dev/null && list="bzr ls --kind=file --versioned"
+
+$list |grep $filter |while read f; 
 do
 	 etags -o TAGS --append $f
 done
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 31221ece0ee..f670adb460c 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -46,6 +46,9 @@ thread_concurrency = 8
 # 
 #skip-networking
 
+# Disable Federated by default
+skip-federated
+
 # Replication Master Server (default)
 # binary logging is required for replication
 log-bin=mysql-bin
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index 6fa4c21f96b..2e3143ac449 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -46,6 +46,9 @@ thread_concurrency = 8
 # 
 #skip-networking
 
+# Disable Federated by default
+skip-federated
+
 # Replication Master Server (default)
 # binary logging is required for replication
 log-bin=mysql-bin
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
index 4a7bfcfc775..10d3e74f619 100644
--- a/support-files/my-medium.cnf.sh
+++ b/support-files/my-medium.cnf.sh
@@ -44,6 +44,9 @@ myisam_sort_buffer_size = 8M
 # 
 #skip-networking
 
+# Disable Federated by default
+skip-federated
+
 # Replication Master Server (default)
 # binary logging is required for replication
 log-bin=mysql-bin
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index aaf01869521..f2b220cf53c 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -27,6 +27,16 @@
 %{?_with_yassl:%define YASSL_BUILD 1}
 %{!?_with_yassl:%define YASSL_BUILD 0}
 
+# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM 3.x)
+# to build with cluster support (off by default)
+%{?_with_cluster:%define CLUSTER_BUILD 1}
+%{!?_with_cluster:%define CLUSTER_BUILD 0}
+
+# use "rpmbuild --with federated" or "rpm --define '_with_federated 1'" (for RPM 3.x)
+# to build with federated support (off by default)
+%{?_with_federated:%define FEDERATED_BUILD 1}
+%{!?_with_federated:%define FEDERATED_BUILD 0}
+
 # use "rpmbuild --with maria" or "rpm --define '_with_maria 1'" (for RPM 3.x)
 # to build with maria support (off by default)
 %{?_with_maria:%define MARIA_BUILD 1}
@@ -139,6 +149,7 @@ This package contains the standard MySQL clients and administration tools.
 
 %{see_base}
 
+%if %{CLUSTER_BUILD}
 %package ndb-storage
 Summary:	MySQL - ndbcluster storage engine
 Group:		Applications/Databases
@@ -179,6 +190,7 @@ This package contains some extra ndbcluster storage engine tools for the advance
 They should be used with caution.
 
 %{see_base}
+%endif
 
 %package test
 Requires: %{name}-client perl-DBI perl
@@ -253,12 +265,19 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
 	./configure \
  	    $* \
 	    --with-innodb \
+%if %{CLUSTER_BUILD}
 	    --with-ndbcluster \
+%else
+  	    --without-ndbcluster \
+%endif
 	    --with-archive-storage-engine \
 	    --with-csv-storage-engine \
-	    --with-example-storage-engine \
 	    --with-blackhole-storage-engine \
+%if %{FEDERATED_BUILD}
 	    --with-federated-storage-engine \
+%else
+   	    --without-federated-storage-engine \
+%endif
 %if %{MARIA_BUILD}
 	    --with-plugin-maria \
 	    --with-maria-tmp-tables \
@@ -573,12 +592,13 @@ sleep 2
 #scheduled service packs and more.  Visit www.mysql.com/enterprise for more
 #information." 
 
+%if %{CLUSTER_BUILD}
 %post ndb-storage
 mysql_clusterdir=/var/lib/mysql-cluster
 
 # Create cluster directory if needed
 if test ! -d $mysql_clusterdir; then mkdir -m 755 $mysql_clusterdir; fi
-
+%endif
 
 %preun server
 if test $1 = 0
@@ -613,7 +633,9 @@ fi
 
 %doc mysql-release-%{mysql_version}/COPYING mysql-release-%{mysql_version}/README 
 %doc mysql-release-%{mysql_version}/support-files/my-*.cnf
+%if %{CLUSTER_BUILD}
 %doc mysql-release-%{mysql_version}/support-files/ndb-*.ini
+%endif
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
 
@@ -708,6 +730,7 @@ fi
 %postun shared
 /sbin/ldconfig
 
+%if %{CLUSTER_BUILD}
 %files ndb-storage
 %defattr(-,root,root,0755)
 %attr(755, root, root) %{_sbindir}/ndbd
@@ -755,6 +778,7 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1*
 %doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1*
 %doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1*
+%endif
 
 %files devel
 %defattr(-, root, root, 0755)
@@ -777,8 +801,10 @@ fi
 %{_libdir}/mysql/libmysqlclient_r.la
 %{_libdir}/mysql/libmystrings.a
 %{_libdir}/mysql/libmysys.a
+%if %{CLUSTER_BUILD}
 %{_libdir}/mysql/libndbclient.a
 %{_libdir}/mysql/libndbclient.la
+%endif
 %{_libdir}/mysql/libvio.a
 %{_libdir}/mysql/libz.a
 %{_libdir}/mysql/libz.la
@@ -787,7 +813,9 @@ fi
 %defattr(-, root, root, 0755)
 # Shared libraries (omit for architectures that don't support them)
 %{_libdir}/libmysql*.so*
+%if %{CLUSTER_BUILD}
 %{_libdir}/libndb*.so*
+%endif
 
 %files test
 %defattr(-, root, root, 0755)
@@ -809,6 +837,11 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog
+* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>
+
+- Made the "Federated" storage engine an option
+- Made the "Cluster" storage engine and sub packages an option
+
 * Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
 
 - Add the man pages for "ndbd" and "ndb_mgmd".