From 7d9861ecd4c32abe1fbae9cb00b7e35a90a5070d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Nov 2005 17:07:54 +0100 Subject: [PATCH 1/2] mysql-test/t/alter_table.test Care for case-insignificant platforms (Mac OS X, Windows). mysql-test/t/alter_table.test: Care for case-insignificant platforms (Mac OS X, Windows). --- mysql-test/t/alter_table.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index bae94656125..f559f52181b 100644 --- a/mysql-test/t/alter_table.test +++ b/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; From 966ab524a336bb22088d4adbb7db7a090762551e Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Dec 2005 17:53:42 +0100 Subject: [PATCH 2/2] Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this. (Backport of an identical change from 5.0) support-files/mysql.spec.sh: We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary. The fully static RPM build on "build" also does not work with the bundled zlib. With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build") and the one already installed on the system for the "max" build which is also labeled "experimental". (Backport of an identical change from 5.0) --- support-files/mysql.spec.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 3d9c2d544ee..7afdae69439 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -249,7 +249,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --includedir=%{_includedir} \ --mandir=%{_mandir} \ --enable-thread-safe-client \ - --with-zlib-dir=bundled \ --with-readline ; # Add this for more debugging support # --with-debug @@ -351,8 +350,9 @@ BuildMySQL "--disable-shared \ %if %{STATIC_BUILD} --with-mysqld-ldflags='-all-static' \ --with-client-ldflags='-all-static' \ - --with-zlib-dir=bundled \ $USE_OTHER_LIBC_DIR \ +%else + --with-zlib-dir=bundled \ %endif --with-comment=\"MySQL Community Edition - Standard (GPL)\" \ --with-server-suffix='%{server_suffix}' \ @@ -689,6 +689,12 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon Dec 05 2005 Joerg Bruehe + +- 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. + * Tue Nov 22 2005 Joerg Bruehe - Extend the file existence check for "init.d/mysql" on un-install