diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
| commit | d61d6146438377f393a80b674a4cb6dd639b6a75 (patch) | |
| tree | 7b3561cb3ea2ad24d013e847680ec165f406387e /include/mysql/plugin.h | |
| parent | 435c9b7d7cdd15102f0f5eddf51e37b3b3b09a27 (diff) | |
| parent | 3604b340e57ab54ccfab5187560e1d7f7eda0453 (diff) | |
| download | mariadb-git-d61d6146438377f393a80b674a4cb6dd639b6a75.tar.gz | |
mysql-5.5.18 merge
Diffstat (limited to 'include/mysql/plugin.h')
| -rw-r--r-- | include/mysql/plugin.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 2e5e6b5c9b0..19601d85f94 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc. +/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. Copyright (C) 2009-2011 Monty Program Ab This program is free software; you can redistribute it and/or modify @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _my_plugin_h #define _my_plugin_h @@ -73,7 +73,7 @@ typedef struct st_mysql_xid MYSQL_XID; */ /* MySQL plugin interface version */ -#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0102 +#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0103 /* MariaDB plugin interface version */ #define MARIA_PLUGIN_INTERFACE_VERSION 0x0101 @@ -151,7 +151,7 @@ MARIA_DECLARE_PLUGIN__(NAME, \ builtin_maria_ ## NAME ## _sizeof_struct_st_plugin, \ builtin_maria_ ## NAME ## _plugin) -#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0}} +#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0,0}} #define maria_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0,0}} /* @@ -176,6 +176,14 @@ typedef int (*mysql_show_var_func)(MYSQL_THD, struct st_mysql_show_var*, char *) /* + Constants for plugin flags. + */ + +#define PLUGIN_OPT_NO_INSTALL 1UL /* Not dynamically loadable */ +#define PLUGIN_OPT_NO_UNINSTALL 2UL /* Not dynamically unloadable */ + + +/* declarations for server variables and command line options */ @@ -447,6 +455,7 @@ struct st_mysql_plugin struct st_mysql_show_var *status_vars; struct st_mysql_sys_var **system_vars; void * __reserved1; /* reserved for dependency checking */ + unsigned long flags; /* flags for plugin */ }; /* |