diff options
author | Daniel Fischer <daniel.fischer@oracle.com> | 2011-09-21 12:40:41 +0200 |
---|---|---|
committer | Daniel Fischer <daniel.fischer@oracle.com> | 2011-09-21 12:40:41 +0200 |
commit | 7450044eb77157275241d40623865e102b577977 (patch) | |
tree | b2ce22644a29502769b8202db0ab2e8f3b5ecea6 /support-files | |
parent | d27d267ee73e9d307e80d4bf91aefcf746b502f7 (diff) | |
parent | 8433c8ce61956fdeea45a55c7262bf509aaefb0d (diff) | |
download | mariadb-git-7450044eb77157275241d40623865e102b577977.tar.gz |
merge from 5.5.16
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/mysql.spec.sh | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index cc6cfdbb778..1442e1b96bd 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -961,7 +961,7 @@ echo "=====" >> $STATUS_HISTORY # Files section ############################################################################## -%files -n MySQL-server%{product_suffix} +%files -n MySQL-server%{product_suffix} -f release/support-files/plugins.files %defattr(-,root,root,0755) %if %{defined license_files_server} @@ -1002,6 +1002,7 @@ echo "=====" >> $STATUS_HISTORY %doc %attr(644, root, man) %{_mandir}/man1/replace.1* %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1* %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf @@ -1019,6 +1020,7 @@ echo "=====" >> $STATUS_HISTORY %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 @@ -1034,29 +1036,7 @@ echo "=====" >> $STATUS_HISTORY %attr(755, root, root) %{_sbindir}/mysqld %attr(755, root, root) %{_sbindir}/mysqld-debug %attr(755, root, root) %{_sbindir}/rcmysql -%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so -%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini -%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so -%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so -%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so -%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so -%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so -%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so -%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so -%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so -%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so %if %{WITH_TCMALLOC} %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} @@ -1162,6 +1142,10 @@ echo "=====" >> $STATUS_HISTORY - "make_win_bin_dist" and its manual are dropped, cmake does it different. +* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com> + +- Add mysql_plugin man page. + * Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com> - Add the manual page for "mysql_plugin" to the server package. @@ -1171,6 +1155,10 @@ echo "=====" >> $STATUS_HISTORY - Null-upmerge the fix of bug#37165: This spec file is not affected. - Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}". +* Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com> + +- Source plugin library files list from cmake-generated file. + * Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com> - Added the mysql_plugin client - enables or disables plugins. |