diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
| commit | 74214b8635c9373abe6ec8f9e7f5f990d13f9fe9 (patch) | |
| tree | 392482e50ca6ab4d828672da8aa5721919eda571 /support-files | |
| parent | 3c9ba0208ae236435f5bad462b41f0df72aaad28 (diff) | |
| parent | 04d60b389701329d934ed2f7690cc2fd686b9f4a (diff) | |
| download | mariadb-git-74214b8635c9373abe6ec8f9e7f5f990d13f9fe9.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
configure.in:
Auto merged
man/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge.
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 57409e08178..b4942072e5d 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -572,7 +572,7 @@ fi %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}/man8/mysqld.8* %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* |