Commit 3653536a authored by Kent Boortz's avatar Kent Boortz
Browse files

Removed option to control if federated is enabled, and enabled it.

parent eb3681ef
Loading
Loading
Loading
Loading
+4 −13
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@
%{?_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}

%if %{STATIC_BUILD}
%define release 0
%else
@@ -342,11 +337,7 @@ BuildMySQL "--enable-shared \
		--with-archive-storage-engine \
		--with-csv-storage-engine \
		--with-blackhole-storage-engine \
%if %{FEDERATED_BUILD}
		--with-federated-storage-engine \
%else
		--without-federated-storage-engine \
%endif
	        --with-partition \
	        --with-big-tables \
		--with-comment=\"MySQL Community Server - Debug (GPL)\"")
@@ -378,11 +369,7 @@ BuildMySQL "--enable-shared \
		--with-archive-storage-engine \
		--with-csv-storage-engine \
		--with-blackhole-storage-engine \
%if %{FEDERATED_BUILD}
		--with-federated-storage-engine \
%else
		--without-federated-storage-engine \
%endif
	        --with-partition \
		--with-embedded-server \
	        --with-big-tables \
@@ -846,6 +833,10 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
* Fri Aug 29 2008 Kent Boortz <kent@mysql.com>

- Removed the "Federated" storage engine option, and enabled in all

* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>

- Get rid of the "warning: Installed (but unpackaged) file(s) found:"