diff options
author | unknown <brian@zim.(none)> | 2006-11-10 17:21:59 -0800 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-11-10 17:21:59 -0800 |
commit | 81d3eb54407d65c06f80c2dfe38e5be3ceb1d40a (patch) | |
tree | 37454e0e0b2e40acf79f5fb9ee63b0cc5548d3c0 /plugin/fulltext | |
parent | 53a95766b41d93cef9f00c089c8879edbc164308 (diff) | |
download | mariadb-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 'plugin/fulltext')
-rw-r--r-- | plugin/fulltext/Makefile.am | 4 | ||||
-rw-r--r-- | plugin/fulltext/plug.in | 3 | ||||
-rw-r--r-- | plugin/fulltext/plugin_example.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am index 7b4ae22cbd2..6ce503f3331 100644 --- a/plugin/fulltext/Makefile.am +++ b/plugin/fulltext/Makefile.am @@ -2,8 +2,8 @@ pkglibdir=$(libdir)/mysql INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include -noinst_LTLIBRARIES= mypluglib.la -#pkglib_LTLIBRARIES= mypluglib.la +#noinst_LTLIBRARIES= mypluglib.la +pkglib_LTLIBRARIES= mypluglib.la mypluglib_la_SOURCES= plugin_example.c mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir) mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN diff --git a/plugin/fulltext/plug.in b/plugin/fulltext/plug.in new file mode 100644 index 00000000000..5bfc401f805 --- /dev/null +++ b/plugin/fulltext/plug.in @@ -0,0 +1,3 @@ +MYSQL_PLUGIN(ftexample, [Simple Parser], + [Simple full-text parser plugin]) +MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la]) diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index f09462f2d1a..47beca18dc7 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -62,7 +62,7 @@ static long number_of_calls= 0; /* for SHOW STATUS, see below */ 1 failure (cannot happen) */ -static int simple_parser_plugin_init(void) +static int simple_parser_plugin_init(void *p) { return(0); } @@ -81,7 +81,7 @@ static int simple_parser_plugin_init(void) */ -static int simple_parser_plugin_deinit(void) +static int simple_parser_plugin_deinit(void *p) { return(0); } |