diff options
| author | unknown <lenz@mysql.com> | 2005-02-17 10:56:20 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-02-17 10:56:20 +0100 |
| commit | 003e7ad18c55cdc48fc29045e6d0faa0cfedb73c (patch) | |
| tree | 416cc701033bf947c2caae7d63eba08928220f0e /support-files | |
| parent | 908857a0b994416e04e92be39b2385acd978cafa (diff) | |
| parent | 1c5881ca3d4ad5d9570bc51be1d9c9311da981e8 (diff) | |
| download | mariadb-git-003e7ad18c55cdc48fc29045e6d0faa0cfedb73c.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
mysql-test/mysql-test-run.pl:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 111efab94f9..e41b795430e 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -277,7 +277,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --includedir=%{_includedir} \ --mandir=%{_mandir} \ --enable-thread-safe-client \ - --with-comment=\"Official MySQL RPM\" \ --with-readline ; # Add this for more debugging support # --with-debug @@ -335,6 +334,7 @@ BuildMySQL "--enable-shared \ --with-example-storage-engine \ --with-federated-storage-engine \ --with-embedded-server \ + --with-comment=\"MySQL Community Edition - Max (GPL)\" \ --with-server-suffix='-Max'" # Save everything for debug @@ -381,6 +381,7 @@ BuildMySQL "--disable-shared \ --with-client-ldflags='-all-static' \ $USE_OTHER_LIBC_DIR \ %endif + --with-comment=\"MySQL Community Edition - Standard (GPL)\" \ --with-server-suffix='%{server_suffix}' \ --without-embedded-server \ --without-berkeley-db \ @@ -689,7 +690,12 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog -* Monday Feb 7 2005 Tomas Ulin <tomas@mysql.com> +* Mon Feb 14 2005 Tomas Ulin <tomas@mysql.com> + +* Fixed the compilation comments and moved them into the separate build sections + for Max and Standard + +* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com> - enabled the "Ndbcluster" storage engine for the max binary - added extra make install in ndb subdir after Max build to get ndb binaries |