Commit ae9952c4 authored by unknown's avatar unknown
Browse files

Merge from 4.1, partly manual. 


scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge.
parents 9f92419e 966ab524

support-files/mysql.spec.sh

+7 −0
Original line number Diff line number Diff line
@@ -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