diff options
| author | unknown <joerg@mysql.com> | 2005-12-05 18:33:48 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-12-05 18:33:48 +0100 |
| commit | ae9952c4b4e8b3a57fb468799cb70ec2ca1aeea9 (patch) | |
| tree | ea48eaa19357f2b99334d46c1f521642e43c9849 /support-files | |
| parent | 9f92419e672f01e6bece91f3490976456a09e6f4 (diff) | |
| parent | 966ab524a336bb22088d4adbb7db7a090762551e (diff) | |
| download | mariadb-git-ae9952c4b4e8b3a57fb468799cb70ec2ca1aeea9.tar.gz | |
Merge from 4.1, partly manual.
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Manual merge.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 4c52b4cee6b..379f7fc966a 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -707,6 +707,13 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com> + +- Avoid using the "bundled" zlib on "shared" builds: + As it is not installed (on the build system), this gives dependency + problems with "libtool" causing the build to fail. + (Change was done on Nov 11, but left uncommented.) + * Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com> - Extend the file existence check for "init.d/mysql" on un-install |