diff options
| author | unknown <brian@zim.(none)> | 2006-09-06 09:23:47 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-06 09:23:47 -0700 |
| commit | 0fbd21584ddece7e61c3124ffbaf8b474779062b (patch) | |
| tree | 8fadc1c847f161a060706946e7efd69bc5654fec /plugin | |
| parent | bc3122a9f8c9fc384361210df0282883d5073a1f (diff) | |
| parent | 71681467ca582a459c624832e367f2b91ee3e05c (diff) | |
| download | mariadb-git-0fbd21584ddece7e61c3124ffbaf8b474779062b.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/tmp/merge-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/fulltext/plugin_example.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index beb02128774..34350e317ba 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -225,7 +225,9 @@ mysql_declare_plugin(ftexample) simple_parser_plugin_init, /* init function (when loaded) */ simple_parser_plugin_deinit,/* deinit function (when unloaded) */ 0x0001, /* version */ - simple_status /* status variables */ + simple_status, /* status variables */ + NULL, /* system variables */ + NULL /* config options */ } mysql_declare_plugin_end; |