diff options
| author | unknown <joerg@mysql.com> | 2005-12-05 19:00:00 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-12-05 19:00:00 +0100 |
| commit | a4235d2760e579b9699d9d5bd3187934272fd1b9 (patch) | |
| tree | da8b2d339d9fd2c4092ec43d14f67a788a8b04b4 /support-files | |
| parent | 55b16e3e6d9c94decc2b71229ba05de6416cb9ca (diff) | |
| parent | ae9952c4b4e8b3a57fb468799cb70ec2ca1aeea9 (diff) | |
| download | mariadb-git-a4235d2760e579b9699d9d5bd3187934272fd1b9.tar.gz | |
Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
mysql-test/t/alter_table.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
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 d93cb1f2176..40d50451635 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -706,6 +706,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 |