null+****@clear*****
null+****@clear*****
2011年 9月 25日 (日) 15:27:15 JST
Kentoku 2011-09-25 06:27:15 +0000 (Sun, 25 Sep 2011)
New Revision: f1a50387dee732950e21fb88cbe5da07f9e0dbfc
Log:
add groonga_default_parser refs #592
Modified files:
ha_mroonga.cc
mrn_table.cc
Modified: ha_mroonga.cc (+9 -0)
===================================================================
--- ha_mroonga.cc 2011-09-25 03:36:00 +0000 (9cd202a)
+++ ha_mroonga.cc 2011-09-25 06:27:15 +0000 (5c10f47)
@@ -124,6 +124,7 @@ FILE *mrn_logfile = NULL;
int mrn_logfile_opened = 0;
grn_log_level mrn_log_level_default = GRN_LOG_DEFAULT_LEVEL;
ulong mrn_log_level = (ulong) mrn_log_level_default;
+char *mrn_default_parser;
static void mrn_logger_func(int level, const char *time, const char *title,
const char *msg, const char *location,
@@ -229,9 +230,17 @@ static MYSQL_SYSVAR_ENUM(log_level, mrn_log_level,
(ulong) mrn_log_level,
&mrn_log_level_typelib);
+static MYSQL_SYSVAR_STR(default_parser, mrn_default_parser,
+ PLUGIN_VAR_RQCMDARG,
+ "default fulltext parser",
+ NULL,
+ NULL,
+ MRN_TOKENIZER_DEFAULT);
+
struct st_mysql_sys_var *mrn_system_variables[] =
{
MYSQL_SYSVAR(log_level),
+ MYSQL_SYSVAR(default_parser),
NULL
};
Modified: mrn_table.cc (+5 -4)
===================================================================
--- mrn_table.cc 2011-09-25 03:36:00 +0000 (aa8ec6d)
+++ mrn_table.cc 2011-09-25 06:27:15 +0000 (412779a)
@@ -61,6 +61,7 @@
extern HASH mrn_open_tables;
extern pthread_mutex_t mrn_open_tables_mutex;
+extern char *mrn_default_parser;
char *mrn_create_string(const char *str, uint length)
{
@@ -487,8 +488,8 @@ int mrn_add_index_param(MRN_SHARE *share, KEY *key_info, int i)
{
if (
!(share->key_parser[i] = mrn_create_string(
- MRN_TOKENIZER_DEFAULT,
- strlen(MRN_TOKENIZER_DEFAULT)))
+ mrn_default_parser,
+ strlen(mrn_default_parser)))
) {
error = HA_ERR_OUT_OF_MEM;
goto error;
@@ -556,8 +557,8 @@ int mrn_add_index_param(MRN_SHARE *share, KEY *key_info, int i)
if (!share->key_parser[i]) {
if (
!(share->key_parser[i] = mrn_create_string(
- MRN_TOKENIZER_DEFAULT,
- strlen(MRN_TOKENIZER_DEFAULT)))
+ mrn_default_parser,
+ strlen(mrn_default_parser)))
) {
error = HA_ERR_OUT_OF_MEM;
goto error;