summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2006-12-14 22:37:13 +0100
committerunknown <joerg@trift2.>2006-12-14 22:37:13 +0100
commitd480867964fd46c3c344075cef8849df8ec4fc5a (patch)
tree9eda8d8f944da922a4251a8cdfebb4f603b49938 /support-files
parent4108725364e4271ceedea644875e1abac00c2dc4 (diff)
parent007357e7cda5efb3fdd12ad37b069a0f5c35daf4 (diff)
downloadmariadb-git-d480867964fd46c3c344075cef8849df8ec4fc5a.tar.gz
Merge trift2.:/MySQL/M41/spec-4.1
into trift2.:/MySQL/M50/spec-5.0 support-files/mysql.spec.sh: Manual merge.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 6000773144c..1c5baddf74a 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*
@@ -589,6 +590,7 @@ fi
%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/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,11 @@ 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.
+
* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)