diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:24:14 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:24:14 +0300 |
| commit | d32bdcb1bfc274476cdd945e66e00f3ec31253c3 (patch) | |
| tree | 20f0ccc7be8e0d205ea5a00d6ec5f57a14d85d3f /support-files | |
| parent | dd0d199ebeab47facb4d01269cda97c258491c22 (diff) | |
| parent | 3f6d78f6c7ad5eb00c4d24b0f0b839a1fb1ead25 (diff) | |
| download | mariadb-git-d32bdcb1bfc274476cdd945e66e00f3ec31253c3.tar.gz | |
merge with 4.0.15
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Delete: scripts/mysql_fix_privilege_tables.sql
include/mysql.h:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_update.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 4afdac9914a..661748adab9 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -3,6 +3,10 @@ %define mysqld_user mysql %define server_suffix -standard +# We don't package all files installed into the build root by intention - +# See BUG#998 for details. +%define _unpackaged_files_terminate_build 0 + %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com Name: MySQL @@ -562,18 +566,26 @@ fi %files embedded %attr(644, root, root) %{_libdir}/mysql/libmysqld.a +# The spec file changelog only includes changes made to the spec file +# itself %changelog +* Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com> + +- Fixed BUG 1162 (removed macro names from the changelog) +- Really fixed BUG 998 (disable the checking for installed but + unpackaged files) + * Tue Aug 05 2003 Lenz Grimmer <lenz@mysql.com> -- Fixed BUG#959 (libmysqld not being compiled properly) -- Fixed BUG#998 (RPM build errors): added missing files to the +- Fixed BUG 959 (libmysqld not being compiled properly) +- Fixed BUG 998 (RPM build errors): added missing files to the distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow, - mysql_fix_privilege_tables.1), removed "-n" from %install section. + mysql_fix_privilege_tables.1), removed "-n" from install section. * Wed Jul 09 2003 Lenz Grimmer <lenz@mysql.com> - removed the GIF Icon (file was not included in the sources anyway) -- removed unused variable %shared_lib_version +- removed unused variable shared_lib_version - do not run automake before building the standard binary (should not be necessary) - add server suffix '-standard' to standard binary (to be in line @@ -594,7 +606,7 @@ fi * Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com> - added missing file mysql_secure_installation to server subpackage - (bug #141) + (BUG 141) * Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com> |