3402 Joerg Bruehe 2011-08-30 [merge]
Merge a RPM packaging bugfix into the 5.6.3 release clone.
modified:
support-files/mysql.spec.sh
3401 hery.ramilison@stripped 2011-08-29
Applying patch from vasil.dimov@stripped for OS X build failure
modified:
storage/innobase/include/ut0crc32.h
storage/innobase/ut/ut0crc32.c
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2011-08-19 17:33:26 +0000
+++ b/support-files/mysql.spec.sh 2011-08-30 10:56:35 +0000
@@ -970,6 +970,7 @@ echo "====="
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqldumpslow.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
@@ -996,11 +997,11 @@ echo "====="
%attr(755, root, root) %{_bindir}/mysql_convert_table_format
%attr(755, root, root) %{_bindir}/mysql_fix_extensions
%attr(755, root, root) %{_bindir}/mysql_install_db
+%attr(755, root, root) %{_bindir}/mysql_plugin
%attr(755, root, root) %{_bindir}/mysql_secure_installation
%attr(755, root, root) %{_bindir}/mysql_setpermission
%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
%attr(755, root, root) %{_bindir}/mysql_upgrade
-%attr(755, root, root) %{_bindir}/mysql_plugin
%attr(755, root, root) %{_bindir}/mysql_zap
%attr(755, root, root) %{_bindir}/mysqlbug
%attr(755, root, root) %{_bindir}/mysqld_multi
@@ -1133,6 +1134,10 @@ echo "====="
# merging BK trees)
##############################################################################
%changelog
+* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Add the manual page for "mysql_plugin" to the server package.
+
* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@stripped>
- Null-upmerge the fix of bug#37165: This spec file is not affected.
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (joerg.bruehe:3401 to 3402) | Joerg Bruehe | 30 Aug |
