mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/M50/mysql-5.0
This commit is contained in:
unknown 2005-12-05 20:42:44 +01:00
commit c9bf8e28a8
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/t/alter_table.test
View file

@ -340,7 +340,9 @@ drop table t1;
# #
# BUG 12207 alter table ... discard table space on MyISAM table causes ERROR 2013 (HY000) # 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; CREATE TABLE T12207(a int) ENGINE=MYISAM;
--replace_result t12207 T12207
--error 1031 --error 1031
ALTER TABLE T12207 DISCARD TABLESPACE; ALTER TABLE T12207 DISCARD TABLESPACE;
DROP TABLE T12207; DROP TABLE T12207;

7
support-files/mysql.spec.sh
View file

@ -707,6 +707,13 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %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> * Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
- Extend the file existence check for "init.d/mysql" on un-install - Extend the file existence check for "init.d/mysql" on un-install