Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  rurik.mysql.com:/home/igor/mysql-5.1
This commit is contained in:
unknown 2006-04-07 17:56:33 -07:00
commit 03920635dc
2 changed files with 7 additions and 5 deletions

View File

@ -2,6 +2,7 @@
AC_INIT(plugin_example, 0.1) AC_INIT(plugin_example, 0.1)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_DISABLE_STATIC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT

View File

@ -17,7 +17,7 @@
#include <ctype.h> #include <ctype.h>
#include <mysql/plugin.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 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 SYNOPSIS
simple_parser_init() 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 SYNOPSIS
simple_parser_deinit() 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. 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; 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 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}, {"static", (char *)"just a static text", SHOW_CHAR},
{"called", (char *)&number_of_calls, SHOW_LONG}, {"called", (char *)&number_of_calls, SHOW_LONG},
@ -229,3 +229,4 @@ mysql_declare_plugin
simple_status /* status variables */ simple_status /* status variables */
} }
mysql_declare_plugin_end; mysql_declare_plugin_end;