add groonga_default_parser refs #592

mroonga · Sep 25, 2011 · f1a5038 · f1a5038
1 parent 8f18cda
commit f1a5038
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -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
 };
 

diff --git a/mrn_table.cc b/mrn_table.cc
@@ -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;