diff options
author | Chuck Bell <chuck.bell@oracle.com> | 2011-08-10 14:39:49 -0400 |
---|---|---|
committer | Chuck Bell <chuck.bell@oracle.com> | 2011-08-10 14:39:49 -0400 |
commit | e08126089ba89646ce3115ccbe2767c4e4430cd2 (patch) | |
tree | ca1ff481f08b6a0ec8540a6a522477b00dd268dd /support-files | |
parent | 1b730666d4a1e3874741a472b7c125bc5d704dd8 (diff) | |
parent | 4baa66ae61d4d3b7a7fad7d70d897ba236c0d253 (diff) | |
download | mariadb-git-e08126089ba89646ce3115ccbe2767c4e4430cd2.tar.gz |
WL#5710 : enable and disable plugins
Merge with main prior to pushing to mysql-5.5.
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/mysql.spec.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 719800e309a..92f055e269a 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -127,13 +127,13 @@ %define distro_description Oracle Enterprise Linux 4 %define distro_releasetag oel4 %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools %else %if "%oelver" == "5" %define distro_description Oracle Enterprise Linux 5 %define distro_releasetag oel5 %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools %else %{error:Oracle Enterprise Linux %{oelver} is unsupported} %endif @@ -145,13 +145,13 @@ %define distro_description Red Hat Enterprise Linux 4 %define distro_releasetag rhel4 %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools %else %if "%rhelver" == "5" %define distro_description Red Hat Enterprise Linux 5 %define distro_releasetag rhel5 %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel - %define distro_requires chkconfig coreutils grep procps shadow-utils + %define distro_requires chkconfig coreutils grep procps shadow-utils net-tools %else %{error:Red Hat Enterprise Linux %{rhelver} is unsupported} %endif @@ -1123,6 +1123,7 @@ echo "=====" >> $STATUS_HISTORY # ---------------------------------------------------------------------------- %files -n MySQL-embedded%{product_suffix} %defattr(-, root, root, 0755) +%attr(755, root, root) %{_bindir}/mysql_embedded %attr(644, root, root) %{_libdir}/mysql/libmysqld.a %attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a @@ -1136,6 +1137,10 @@ echo "=====" >> $STATUS_HISTORY - 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 + * Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com> - Fix bug#45415: "rpm upgrade recreates test database" |