diff options
| author | unknown <serg@serg.mylan> | 2006-04-07 22:38:53 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-04-07 22:38:53 +0200 |
| commit | ef1ec197449dbfc00f64834af4564021368ac765 (patch) | |
| tree | abf88bf2785ceb55edc34d40b031cfe0e9c12a76 /plugin | |
| parent | c59b3fff64de4393be206ff933b177a43401edfc (diff) | |
| parent | 66806e58e8520f5399c80e4f899ebf0cd72f71e3 (diff) | |
| download | mariadb-git-ef1ec197449dbfc00f64834af4564021368ac765.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/fulltext/configure.in | 1 | ||||
| -rw-r--r-- | plugin/fulltext/plugin_example.c | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/plugin/fulltext/configure.in b/plugin/fulltext/configure.in index dc0a2f4630d..2fefa68727c 100644 --- a/plugin/fulltext/configure.in +++ b/plugin/fulltext/configure.in @@ -2,6 +2,7 @@ AC_INIT(plugin_example, 0.1) AM_INIT_AUTOMAKE +AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index 8f84793c1e5..cdf1527b310 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -17,7 +17,7 @@ #include <ctype.h> #include <mysql/plugin.h> -long number_of_calls= 0; /* for SHOW STATUS, see below */ +static long number_of_calls= 0; /* for SHOW STATUS, see below */ /* Simple full-text parser plugin that acts as a replacement for the @@ -84,7 +84,7 @@ static int simple_parser_plugin_deinit(void) /* - Initialize the parser at ... [WHEN] + Initialize the parser on the first use in the query SYNOPSIS simple_parser_init() @@ -104,7 +104,7 @@ static int simple_parser_init(MYSQL_FTPARSER_PARAM *param) /* - Terminate the parser at ... [WHEN] + Terminate the parser at the end of the query SYNOPSIS simple_parser_deinit() @@ -164,7 +164,7 @@ static void add_word(MYSQL_FTPARSER_PARAM *param, char *word, size_t len) and passes every word to the MySQL full-text indexing engine. */ -int simple_parser_parse(MYSQL_FTPARSER_PARAM *param) +static int simple_parser_parse(MYSQL_FTPARSER_PARAM *param) { char *end, *start, *docend= param->doc + param->length; @@ -205,7 +205,7 @@ static struct st_mysql_ftparser simple_parser_descriptor= Plugin status variables for SHOW STATUS */ -struct st_mysql_show_var simple_status[]= +static struct st_mysql_show_var simple_status[]= { {"static", (char *)"just a static text", SHOW_CHAR}, {"called", (char *)&number_of_calls, SHOW_LONG}, @@ -229,3 +229,4 @@ mysql_declare_plugin simple_status /* status variables */ } mysql_declare_plugin_end; + |