Commit a4235d27 authored by unknown's avatar unknown
Browse files

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
parents 55b16e3e ae9952c4

support-files/mysql.spec.sh

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