lots of post-merge changes

This commit is contained in:
Sergei Golubchik 2011-04-25 17:22:25 +02:00
commit 0accbd0364
738 changed files with 9203 additions and 10969 deletions

View file

@ -145,7 +145,7 @@ static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param
the list of search terms when parsing a search string.
*/
static void add_word(MYSQL_FTPARSER_PARAM *param, const unsigned char *word, size_t len)
static void add_word(MYSQL_FTPARSER_PARAM *param, const char *word, size_t len)
{
MYSQL_FTPARSER_BOOLEAN_INFO bool_info=
{ FT_TOKEN_WORD, 0, 0, 0, 0, ' ', 0 };
@ -169,7 +169,7 @@ static void add_word(MYSQL_FTPARSER_PARAM *param, const unsigned char *word, siz
static int simple_parser_parse(MYSQL_FTPARSER_PARAM *param)
{
const unsigned char *end, *start, *docend= param->doc + param->length;
const char *end, *start, *docend= param->doc + param->length;
number_of_calls++;