summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2005-12-05 18:33:48 +0100
committerjoerg@mysql.com <>2005-12-05 18:33:48 +0100
commitb9451ee51fcd64b6ca56591a225bc701691d3bdc (patch)
treeea48eaa19357f2b99334d46c1f521642e43c9849 /support-files
parentb5293c415fcd0720898b56e7fc2a82ee3f393bb8 (diff)
parent7ce92291f039f6ebec328205701da59603c21c69 (diff)
downloadmariadb-git-b9451ee51fcd64b6ca56591a225bc701691d3bdc.tar.gz
Merge from 4.1, partly manual.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh7
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