diff options
author | unknown <istruewing@chilla.local> | 2006-12-19 12:41:39 +0100 |
---|---|---|
committer | unknown <istruewing@chilla.local> | 2006-12-19 12:41:39 +0100 |
commit | d6bc366f44798198da40eb870c7337b09927ac3e (patch) | |
tree | 1bf284dbd550ad3a50e9e15ba2b4e0245ab9e440 /support-files/mysql.spec.sh | |
parent | b9d2627ca18bf31f1e5cd62a7a3b5c6e4ea79de9 (diff) | |
parent | 6dd079a6c1450a8e0407e3160792e9d54ddd2c84 (diff) | |
download | mariadb-git-d6bc366f44798198da40eb870c7337b09927ac3e.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
configure.in:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'support-files/mysql.spec.sh')
-rw-r--r-- | support-files/mysql.spec.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 6000773144c..1bf983cb02c 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -575,6 +575,7 @@ fi %doc %attr(644, root, root) %{_infodir}/mysql.info* +%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* %doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1* %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1* %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1* @@ -587,8 +588,9 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqlmanager.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlmanager.8* %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* %doc %attr(644, root, man) %{_mandir}/man1/perror.1* %doc %attr(644, root, man) %{_mandir}/man1/replace.1* @@ -753,6 +755,12 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com> + +- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql" + in the server RPM. +- The "mysqlmanager" man page got moved from section 1 to 8. + * Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com> - Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) |