summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-03-13 12:51:25 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-03-13 12:51:25 +0400
commit390afdd16ee2a4aef2271bdf6f3b412d7d562ce7 (patch)
tree4b7597de9066ea23387940ce794fdc88f51204fc /sql/mysql_priv.h
parentec39e58d13f95e455a6553bca3e618e7065707d0 (diff)
downloadmariadb-git-390afdd16ee2a4aef2271bdf6f3b412d7d562ce7.tar.gz
Bug#42610 Dynamic plugin broken in 5.1.31
--added ability to obtain plugin variables from my.cnf on INSTALL PLUGIN stage --option 'ignore-builtin-innodb' disables all InnoDB builtin plugins (including I_S plugins)
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index a2fbddd667a..2c938fc96a2 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -2047,6 +2047,9 @@ extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
extern SHOW_COMP_OPTION have_crypt;
extern SHOW_COMP_OPTION have_compress;
+extern int orig_argc;
+extern char **orig_argv;
+extern const char *load_default_groups[];
#ifndef __WIN__
extern pthread_t signal_thread;