Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/M50/mysql-5.0

mysql-test/t/alter_table.test

@@ -340,7 +340,9 @@ drop table t1;
 #
 # BUG 12207 alter table ... discard table space on MyISAM table causes ERROR 2013 (HY000)
 #
+# Some platforms (Mac OS X, Windows) will send the error message using small letters.
 CREATE TABLE T12207(a int) ENGINE=MYISAM;
+--replace_result t12207 T12207
 --error 1031
 ALTER TABLE T12207 DISCARD TABLESPACE;
 DROP TABLE T12207;

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