diff options
| author | unknown <joerg@trift2.> | 2006-07-24 15:47:57 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2006-07-24 15:47:57 +0200 |
| commit | c98ff21c3a95f5b01e34078ab9b2466fdf2284d5 (patch) | |
| tree | 34c3fc279160250235c562d3f8766919381789b1 /support-files/mysql.spec.sh | |
| parent | af3f6282a5ece66986439457e4fd29e383c109cb (diff) | |
| parent | b53e47a1ec183896994b5dbbae5e27129fce6981 (diff) | |
| download | mariadb-git-c98ff21c3a95f5b01e34078ab9b2466fdf2284d5.tar.gz | |
Merge trift2.:/M41/tmp_merge
into trift2.:/M50/merge-4.1-to-5.0
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
sql/item_timefunc.cc:
Merging by "ul", as asked in the original changeset.
support-files/mysql.spec.sh:
Manual merge, keeping alphabetic order.
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index b955fff469d..57409e08178 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -567,15 +567,18 @@ fi %doc %attr(644, root, root) %{_infodir}/mysql.info* +%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* %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1* %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/mysql.server.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* |