summaryrefslogtreecommitdiff
path: root/storage/innobase/fts/fts0pars.y
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/fts/fts0pars.y')
-rw-r--r--storage/innobase/fts/fts0pars.y17
1 files changed, 8 insertions, 9 deletions
diff --git a/storage/innobase/fts/fts0pars.y b/storage/innobase/fts/fts0pars.y
index e48036e82fe..1f4ec9922e3 100644
--- a/storage/innobase/fts/fts0pars.y
+++ b/storage/innobase/fts/fts0pars.y
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -24,12 +24,13 @@ this program; if not, write to the Free Software Foundation, Inc.,
*/
%{
-
+#include "ha_prototypes.h"
#include "mem0mem.h"
#include "fts0ast.h"
#include "fts0blex.h"
#include "fts0tlex.h"
#include "fts0pars.h"
+#include <my_sys.h>
extern int fts_lexer(YYSTYPE*, fts_lexer_t*);
extern int fts_blexer(YYSTYPE*, yyscan_t);
@@ -139,7 +140,7 @@ expr : term {
}
| text '@' FTS_NUMB {
- fts_ast_term_set_distance($1, fts_ast_string_to_ul($3, 10));
+ fts_ast_text_set_distance($1, fts_ast_string_to_ul($3, 10));
fts_ast_string_free($3);
}
@@ -157,7 +158,7 @@ expr : term {
| prefix text '@' FTS_NUMB {
$$ = fts_ast_create_node_list(state, $1);
fts_ast_add_node($$, $2);
- fts_ast_term_set_distance($2, fts_ast_string_to_ul($4, 10));
+ fts_ast_text_set_distance($2, fts_ast_string_to_ul($4, 10));
fts_ast_string_free($4);
}
@@ -224,7 +225,6 @@ ftserror(
/********************************************************************
Create a fts_lexer_t instance.*/
-
fts_lexer_t*
fts_lexer_create(
/*=============*/
@@ -233,17 +233,17 @@ fts_lexer_create(
ulint query_len)
{
fts_lexer_t* fts_lexer = static_cast<fts_lexer_t*>(
- ut_malloc(sizeof(fts_lexer_t)));
+ ut_malloc_nokey(sizeof(fts_lexer_t)));
if (boolean_mode) {
fts0blex_init(&fts_lexer->yyscanner);
- fts0b_scan_bytes((char*) query, query_len, fts_lexer->yyscanner);
+ fts0b_scan_bytes((char*) query, (int) query_len, fts_lexer->yyscanner);
fts_lexer->scanner = (fts_scan) fts_blexer;
/* FIXME: Debugging */
/* fts0bset_debug(1 , fts_lexer->yyscanner); */
} else {
fts0tlex_init(&fts_lexer->yyscanner);
- fts0t_scan_bytes((char*) query, query_len, fts_lexer->yyscanner);
+ fts0t_scan_bytes((char*) query, (int) query_len, fts_lexer->yyscanner);
fts_lexer->scanner = (fts_scan) fts_tlexer;
}
@@ -269,7 +269,6 @@ fts_lexer_free(
/********************************************************************
Call the appropaiate scanner.*/
-
int
fts_lexer(
/*======*/