mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
This commit is contained in:
serg@serg.mylan 2006-01-17 18:35:13 +01:00
commit 442e328ee9
3 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/plugin.h
View file

@ -75,7 +75,7 @@ struct st_mysql_plugin
const char *descr; /* general descriptive text (for SHOW PLUGINS ) */
int (*init)(void); /* the function to invoke when plugin is loaded */
int (*deinit)(void); /* the function to invoke when plugin is unloaded */
uint version; /* plugin version (for SHOW PLUGINS) */
unsigned int version; /* plugin version (for SHOW PLUGINS) */
struct st_mysql_show_var *status_vars;
};
@ -176,11 +176,11 @@ typedef struct st_mysql_ftparser_boolean_info
enum enum_ft_token_type type;
int yesno;
int weight_adjust;
bool wasign;
bool trunc;
char wasign;
char trunc;
/* These are parser state and must be removed. */
byte prev;
byte *quot;
char prev;
char *quot;
} MYSQL_FTPARSER_BOOLEAN_INFO;
@ -224,14 +224,14 @@ typedef struct st_mysql_ftparser_boolean_info
typedef struct st_mysql_ftparser_param
{
int (*mysql_parse)(void *param, byte *doc, uint doc_len);
int (*mysql_add_word)(void *param, byte *word, uint word_len,
int (*mysql_parse)(void *param, char *doc, int doc_len);
int (*mysql_add_word)(void *param, char *word, int word_len,
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);
void *ftparser_state;
void *mysql_ftparam;
CHARSET_INFO *cs;
byte *doc;
uint length;
struct charset_info_st *cs;
char *doc;
int length;
int mode;
} MYSQL_FTPARSER_PARAM;

7
plugin/fulltext/plugin_example.c
View file

@ -13,9 +13,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h>
#include <m_string.h>
#include <m_ctype.h>
#include <stdlib.h>
#include <ctype.h>
#include <plugin.h>
long number_of_calls= 0; /* for SHOW STATUS, see below */
@ -181,7 +180,7 @@ int simple_parser_parse(MYSQL_FTPARSER_PARAM *param)
add_word(param, start, end - start);
break;
}
else if (my_isspace(param->cs, *end))
else if (isspace(*end))
{
if (end > start)
add_word(param, start, end - start);

20
storage/myisam/ft_boolean_search.c
View file

@ -165,7 +165,7 @@ typedef struct st_my_ftb_param
} MY_FTB_PARAM;
static int ftb_query_add_word(void *param, byte *word, uint word_len,
static int ftb_query_add_word(void *param, char *word, int word_len,
MYSQL_FTPARSER_BOOLEAN_INFO *info)
{
MY_FTB_PARAM *ftb_param= (MY_FTB_PARAM *)param;
@ -264,13 +264,13 @@ static int ftb_query_add_word(void *param, byte *word, uint word_len,
}
static int ftb_parse_query_internal(void *param, byte *query, uint len)
static int ftb_parse_query_internal(void *param, char *query, int len)
{
MY_FTB_PARAM *ftb_param= (MY_FTB_PARAM *)param;
MYSQL_FTPARSER_BOOLEAN_INFO info;
CHARSET_INFO *cs= ftb_param->ftb->charset;
byte **start= &query;
byte *end= query + len;
char **start= &query;
char *end= query + len;
FT_WORD w;
info.prev= ' ';
@ -571,7 +571,7 @@ typedef struct st_my_ftb_phrase_param
} MY_FTB_PHRASE_PARAM;
static int ftb_phrase_add_word(void *param, byte *word, uint word_len,
static int ftb_phrase_add_word(void *param, char *word, int word_len,
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused)))
{
MY_FTB_PHRASE_PARAM *phrase_param= (MY_FTB_PHRASE_PARAM *)param;
@ -601,11 +601,11 @@ static int ftb_phrase_add_word(void *param, byte *word, uint word_len,
}
static int ftb_check_phrase_internal(void *param, byte *document, uint len)
static int ftb_check_phrase_internal(void *param, char *document, int len)
{
FT_WORD word;
MY_FTB_PHRASE_PARAM *phrase_param= (MY_FTB_PHRASE_PARAM *)param;
const byte *docend= document + len;
const char *docend= document + len;
while (ft_simple_get_word(phrase_param->cs, &document, docend, &word, FALSE))
{
ftb_phrase_add_word(param, word.pos, word.len, 0);
@ -812,7 +812,7 @@ typedef struct st_my_ftb_find_param
} MY_FTB_FIND_PARAM;
static int ftb_find_relevance_add_word(void *param, byte *word, uint len,
static int ftb_find_relevance_add_word(void *param, char *word, int len,
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused)))
{
MY_FTB_FIND_PARAM *ftb_param= (MY_FTB_FIND_PARAM *)param;
@ -845,10 +845,10 @@ static int ftb_find_relevance_add_word(void *param, byte *word, uint len,
}
static int ftb_find_relevance_parse(void *param, byte *doc, uint len)
static int ftb_find_relevance_parse(void *param, char *doc, int len)
{
FT_INFO *ftb= ((MY_FTB_FIND_PARAM *)param)->ftb;
byte *end= doc + len;
char *end= doc + len;
FT_WORD w;
while (ft_simple_get_word(ftb->charset, &doc, end, &w, TRUE))
ftb_find_relevance_add_word(param, w.pos, w.len, 0);