summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorbrian@zim.(none) <>2006-09-06 09:23:47 -0700
committerbrian@zim.(none) <>2006-09-06 09:23:47 -0700
commit1ac47c95135dfc7a733d5a6f11c08cbc341da33f (patch)
tree8fadc1c847f161a060706946e7efd69bc5654fec /include
parente51935b3631217098500a9bbb0e96d575b3ace09 (diff)
parentfa98e9c71808b704dedc360c7412a647c8444097 (diff)
downloadmariadb-git-1ac47c95135dfc7a733d5a6f11c08cbc341da33f.tar.gz
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/tmp/merge-5.1
Diffstat (limited to 'include')
-rw-r--r--include/mysql/plugin.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 156c3312c53..739f7bc5fc6 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -60,7 +60,7 @@ __MYSQL_DECLARE_PLUGIN(NAME, \
builtin_ ## NAME ## _sizeof_struct_st_plugin, \
builtin_ ## NAME ## _plugin)
-#define mysql_declare_plugin_end ,{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}}
/*
declarations for SHOW STATUS support in plugins
@@ -96,6 +96,8 @@ struct st_mysql_plugin
int (*deinit)(void); /* the function to invoke when plugin is unloaded */
unsigned int version; /* plugin version (for SHOW PLUGINS) */
struct st_mysql_show_var *status_vars;
+ void * __reserved1; /* placeholder for system variables */
+ void * __reserved2; /* placeholder for config options */
};
/*************************************************************************