diff options
| author | Kent Boortz <kent@kent-amd64> | 2008-08-29 17:31:31 +0200 |
|---|---|---|
| committer | Kent Boortz <kent@kent-amd64> | 2008-08-29 17:31:31 +0200 |
| commit | fc024a71f197eed6d8a1a46720d162d969e14d7c (patch) | |
| tree | 8c3deac66e9e98d94bcfdf687f4400f6e9cd14d4 /support-files/mysql.spec.sh | |
| parent | a521c81d1604c249e49b8e9f292724d1ef9e8069 (diff) | |
| download | mariadb-git-fc024a71f197eed6d8a1a46720d162d969e14d7c.tar.gz | |
Removed option to control if federated is enabled, and enabled it.
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index afa552c67a5..31e1c205d66 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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:" |