summaryrefslogtreecommitdiff
path: root/include/mysql
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-11-10 17:21:59 -0800
committerunknown <brian@zim.(none)>2006-11-10 17:21:59 -0800
commit81d3eb54407d65c06f80c2dfe38e5be3ceb1d40a (patch)
tree37454e0e0b2e40acf79f5fb9ee63b0cc5548d3c0 /include/mysql
parent53a95766b41d93cef9f00c089c8879edbc164308 (diff)
downloadmariadb-git-81d3eb54407d65c06f80c2dfe38e5be3ceb1d40a.tar.gz
This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :)
configure.in: Removed unneeded call to old plugin syntax. include/mysql/plugin.h: Updates for daemon type (and fixed warning on declare end). plugin/fulltext/Makefile.am: Updated names so that we can install and test it. plugin/fulltext/plugin_example.c: Fixed wrong call. sql/mysqld.cc: Removed old have_example (we don't need it any longer). sql/set_var.cc: Removed old have_example sql/sql_plugin.cc: Added support for DAEMON type (just an internal raw plugin) storage/example/plug.in: Removed example static build so that we can test dynamic engines plugin/daemon_example/AUTHORS: New BitKeeper file ``plugin/daemon_example/AUTHORS'' plugin/daemon_example/ChangeLog: New BitKeeper file ``plugin/daemon_example/ChangeLog'' plugin/daemon_example/Makefile.am: New BitKeeper file ``plugin/daemon_example/Makefile.am'' plugin/daemon_example/NEWS: New BitKeeper file ``plugin/daemon_example/NEWS'' plugin/daemon_example/README: New BitKeeper file ``plugin/daemon_example/README'' plugin/daemon_example/configure.in: New BitKeeper file ``plugin/daemon_example/configure.in'' plugin/daemon_example/daemon_example.c: New BitKeeper file ``plugin/daemon_example/daemon_example.c'' plugin/daemon_example/plug.in: New BitKeeper file ``plugin/daemon_example/plug.in'' plugin/fulltext/plug.in: Added plug.in file so that we compile fulltext example!
Diffstat (limited to 'include/mysql')
-rw-r--r--include/mysql/plugin.h22
1 files changed, 20 insertions, 2 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 22cd64a52c4..1385bb502bb 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -29,7 +29,8 @@
#define MYSQL_UDF_PLUGIN 0 /* User-defined function */
#define MYSQL_STORAGE_ENGINE_PLUGIN 1 /* Storage Engine */
#define MYSQL_FTPARSER_PLUGIN 2 /* Full-text parser plugin */
-#define MYSQL_MAX_PLUGIN_TYPE_NUM 3 /* The number of plugin types */
+#define MYSQL_DAEMON_PLUGIN 3 /* The daemon/raw plugin type */
+#define MYSQL_MAX_PLUGIN_TYPE_NUM 4 /* The number of plugin types */
/* We use the following strings to define licenses for plugins */
#define PLUGIN_LICENSE_PROPRIETARY 0
@@ -65,7 +66,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,0,0}}
+#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0,0}}
/*
declarations for SHOW STATUS support in plugins
@@ -296,6 +297,13 @@ struct st_mysql_ftparser
};
/*************************************************************************
+ API for Storage Engine plugin. (MYSQL_DAEMON_PLUGIN)
+*/
+
+/* handlertons of different MySQL releases are incompatible */
+#define MYSQL_DAEMON_INTERFACE_VERSION (MYSQL_VERSION_ID << 8)
+
+/*************************************************************************
API for Storage Engine plugin. (MYSQL_STORAGE_ENGINE_PLUGIN)
*/
@@ -313,5 +321,15 @@ struct st_mysql_storage_engine
int interface_version;
};
+/*
+ Here we define only the descriptor structure, that is referred from
+ st_mysql_plugin.
+*/
+
+struct st_mysql_daemon
+{
+ int interface_version;
+};
+
#endif