diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-06 18:48:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-06 18:48:16 +0200 |
| commit | 4170093ab564e4813bd3379f95ca27dd45d5c8f8 (patch) | |
| tree | 298081ca2a221cdd445dbdc9a819d2400a6355b9 | |
| parent | da81a1f01e2b689c61d549e1277ac0c2d61c2814 (diff) | |
| parent | 033a2527da96e80f2a46a5ede84d3e03544c51e0 (diff) | |
| download | mariadb-git-4170093ab564e4813bd3379f95ca27dd45d5c8f8.tar.gz | |
merge with feedback-plugin
and disable feedback plugin by default, if it's compiled in.
| -rw-r--r-- | plugin/feedback/plug.in | 3 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/plugin/feedback/plug.in b/plugin/feedback/plug.in index 409a35c8f9a..88a4448321d 100644 --- a/plugin/feedback/plug.in +++ b/plugin/feedback/plug.in @@ -19,6 +19,9 @@ MYSQL_PLUGIN_STATIC(feedback, [libfeedback.la]) ]) +dnl MariaDB before 5.5 needs this define: +MYSQL_PLUGIN_DEFINE(feedback, [WITH_FEEDBACK_PLUGIN]) + MYSQL_PLUGIN_ACTIONS(feedback, [ AC_CHECK_HEADERS([netdb.h sys/utsname.h]) ]) diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 8fc02f4b196..6d85f563e1a 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -3345,6 +3345,10 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp, if (!my_strcasecmp(&my_charset_latin1, tmp->name.str, "ndbcluster")) plugin_load_policy= PLUGIN_OFF; #endif +#ifdef WITH_FEEDBACK_PLUGIN + if (!my_strcasecmp(&my_charset_latin1, tmp->name.str, "feedback")) + plugin_load_policy= PLUGIN_OFF; +#endif for (opt= tmp->plugin->system_vars; opt && *opt; opt++) count+= 2; /* --{plugin}-{optname} and --plugin-{plugin}-{optname} */ |