summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <df@kahlann.erinye.com>2006-12-15 09:27:23 +0100
committerunknown <df@kahlann.erinye.com>2006-12-15 09:27:23 +0100
commit0085879f43bebbcceccaf02d16564be4e7e59f5f (patch)
treee1b71c0fe60577ec656cc364d1d0145af041148b
parent32fcce2b6031ce90b0d0251f2f95a98ffa379898 (diff)
parent13eeee6f3f3f84026d67a01115ef77d676bf7aff (diff)
downloadmariadb-git-0085879f43bebbcceccaf02d16564be4e7e59f5f.tar.gz
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
-rw-r--r--support-files/mysql.spec.sh10
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)