diff options
author | unknown <serg@serg.mylan> | 2004-08-26 15:19:46 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-08-26 15:19:46 +0200 |
commit | e8d41a5b1bf0c559c5c3acab469eaa6ff56accfb (patch) | |
tree | 9299076637e9019c66560b2d68fe6b4bc6456487 /support-files | |
parent | 42771f9877c17050a230cdaf8a26afc5d077a712 (diff) | |
parent | ad1f3bb17d5a8117ff9feb987c04a52f22394189 (diff) | |
download | mariadb-git-e8d41a5b1bf0c559c5c3acab469eaa6ff56accfb.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
VC++Files/sql/mysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlmanager-pwgen.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
extra/resolveip.c:
Auto merged
include/my_getopt.h:
Auto merged
innobase/buf/buf0rea.c:
Auto merged
isam/isamchk.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/mysql.spec.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 6ec05433bef..e7f8a035a15 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -156,7 +156,7 @@ Summary: MySQL - server with Berkeley DB, RAID and UDF support Group: Applications/Databases Provides: mysql-Max Obsoletes: mysql-Max -Requires: MySQL >= 4.0 +Requires: MySQL-server >= 4.0 %description Max Optional MySQL server binary that supports additional features like @@ -594,8 +594,13 @@ fi %attr(644, root, root) %{_libdir}/mysql/libmysqld.a # The spec file changelog only includes changes made to the spec file -# itself +# itself - note that they must be ordered by date (important when +# merging BK trees) %changelog +* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com> + +- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860) + * Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com> - do not link statically on IA64/AMD64 as these systems do not have |