diff options
| author | unknown <joerg@mysql.com> | 2005-12-05 20:42:44 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-12-05 20:42:44 +0100 |
| commit | c9bf8e28a86c6eec53bb20d657e667c5fe1dbe88 (patch) | |
| tree | ae4adefad7af9199ecd6238b0414413ddb799f62 | |
| parent | c67e6d41bdd73e5efa3230d4c66ca2a9fde165f0 (diff) | |
| parent | ae9952c4b4e8b3a57fb468799cb70ec2ca1aeea9 (diff) | |
| download | mariadb-git-c9bf8e28a86c6eec53bb20d657e667c5fe1dbe88.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
| -rw-r--r-- | mysql-test/t/alter_table.test | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index 3878b55da11..f4245abfe86 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; 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 |