summaryrefslogtreecommitdiff
path: root/include/mysql/plugin.h
diff options
context:
space:
mode:
authorunknown <acurtis@xiphis.org>2006-05-02 04:11:00 -0700
committerunknown <acurtis@xiphis.org>2006-05-02 04:11:00 -0700
commitad4c32c89a1b12a38518b589c944ac06ae023b50 (patch)
tree5d9330a6ecd663b4caf7da376b8a6372a8edeac7 /include/mysql/plugin.h
parentb0efe477fbec37c273098bc85263b195544f2edc (diff)
downloadmariadb-git-ad4c32c89a1b12a38518b589c944ac06ae023b50.tar.gz
WL#3201 additional post-review fixes
config/ac-macros/plugins.m4: remove unneccessary `ifelse' add comment, add missing dnl configure.in: change description for heap engine include/mysql/plugin.h: change macro name sql/ha_berkeley.cc: store strings statically for use in handlerton and plugin structures sql/ha_federated.cc: store strings statically for use in handlerton and plugin structures sql/ha_heap.cc: store strings statically for use in handlerton and plugin structures sql/ha_innodb.cc: store strings statically for use in handlerton and plugin structures sql/ha_myisam.cc: store strings statically for use in handlerton and plugin structures sql/ha_myisammrg.cc: store strings statically for use in handlerton and plugin structures sql/ha_ndbcluster.cc: store strings statically for use in handlerton and plugin structures sql/ha_partition.cc: store strings statically for use in handlerton and plugin structures storage/archive/ha_archive.cc: store strings statically for use in handlerton and plugin structures storage/blackhole/ha_blackhole.cc: store strings statically for use in handlerton and plugin structures storage/csv/ha_tina.cc: store strings statically for use in handlerton and plugin structures storage/example/ha_example.cc: store strings statically for use in handlerton and plugin structures
Diffstat (limited to 'include/mysql/plugin.h')
-rw-r--r--include/mysql/plugin.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 2093043744a..ab5ca6e7be4 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -39,23 +39,23 @@
#ifndef MYSQL_DYNAMIC_PLUGIN
-#define __DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \
+#define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \
int VERSION= MYSQL_PLUGIN_INTERFACE_VERSION; \
int PSIZE= sizeof(struct st_mysql_plugin); \
struct st_mysql_plugin DECLS[]= {
#else
-#define __DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \
+#define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \
int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \
int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \
struct st_mysql_plugin _mysql_plugin_declarations_[]= {
#endif
-#define _DECLARE_PLUGIN(NAME) \
-__DECLARE_PLUGIN(NAME, builtin_ ## NAME ## _plugin_interface_version, \
+#define mysql_declare_plugin(NAME) \
+__MYSQL_DECLARE_PLUGIN(NAME, \
+ builtin_ ## NAME ## _plugin_interface_version, \
builtin_ ## NAME ## _sizeof_struct_st_plugin, \
builtin_ ## NAME ## _plugin)
-#define mysql_declare_plugin(NAME) _DECLARE_PLUGIN(NAME)
#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}}
/*