diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:29:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:29:38 +0400 |
| commit | 6e5bbf513810448e84872069065a0561e0d70a93 (patch) | |
| tree | e40e3ed079113e0bbbb9270aaccddcea851b3d77 /support-files | |
| parent | 888b8793a256040ab9b7e008c52936da75a3d116 (diff) | |
| download | mariadb-git-6e5bbf513810448e84872069065a0561e0d70a93.tar.gz | |
Cherry-picking WL#5710 from mysql-5.5 to mysql-5.5.16-release.
Original revision id:
# revno: 3489 [merge]
# revision-id: tatjana.nuernberg@oracle.com-20110811120945-c6x9a5d2du8s9oj2
# parent: tatjana.nuernberg@oracle.com-20110811112736-so8r813hs8dmf7nr
# parent: chuck.bell@oracle.com-20110810183949-2s9uxcuoux2p668e
# committer: Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>
# branch nick: 55-9
# timestamp: Thu 2011-08-11 13:09:45 +0100
# message:
# auto-merge
This merge revision also has a patch for Bug 12664445, which has been also
taken to 5.5.16.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 9bbf846e706..b32a7dd836c 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1000,6 +1000,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 @@ -1015,6 +1016,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/daemon_example.ini %if %{WITH_TCMALLOC} %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} @@ -1113,6 +1115,10 @@ echo "=====" >> $STATUS_HISTORY - 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. + * Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com> - Fix bug#12561297: Added the MySQL embedded binary |