Commit 600da42e authored by Chuck Bell's avatar Chuck Bell

WL#5710: enable and disable plugins

This patch corrects a problem found in pushbuild with the stat()
method on some platforms. The code was changed to use my_stat()
instead.

Also adds mysql_plugin to the mysql.spec.sh file for packaging.
parent b38bbcf8
......@@ -18,7 +18,7 @@
#include <m_string.h>
#include <mysql.h>
#include <my_getopt.h>
#include <sys/stat.h>
#include <my_dir.h>
#include <my_global.h>
#include <stdio.h>
#include <string.h>
......@@ -501,14 +501,13 @@ get_one_option(int optid,
static int file_exists(char * filename)
{
struct stat buf;
int i = stat (filename, &buf);
/* File found */
if (i == 0)
MY_STAT stat_arg;
if (!my_stat(filename, &stat_arg, MYF(0)))
{
return 1;
return 0;
}
return 0;
return 1;
}
......@@ -924,7 +923,8 @@ static int find_tool(const char *tool_name, char *tool_path)
const char *paths[]= {
opt_basedir, "/usr", "/usr/local/mysql", "/usr/sbin", "/usr/share",
"/extra", "/extra/debug", "/extra/release", "/bin"
"/extra", "/extra/debug", "/extra/release", "/bin", "/usr/bin",
"/mysql/bin"
};
for (i= 0; i < (int)array_elements(paths); i++)
{
......
......@@ -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
......@@ -1017,6 +1018,7 @@ echo "=====" >> $STATUS_HISTORY
%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
......@@ -1130,6 +1132,10 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
- Added the mysql_plugin client - enables or disables plugins.
* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Fix bug#45415: "rpm upgrade recreates test database"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment