add parameter 'groonga_default_wrapper_engine'. refs #1195

mroonga · Dec 26, 2011 · 6060d13 · 6060d13
1 parent 7501725
commit 6060d13
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -456,6 +456,7 @@ static bool mrn_log_file_opened = false;
 static grn_log_level mrn_log_level_default = GRN_LOG_DEFAULT_LEVEL;
 static ulong mrn_log_level = (ulong) mrn_log_level_default;
 char *mrn_default_parser = NULL;
+char *mrn_default_wrapper_engine = NULL;
 static char *mrn_libgroonga_version = (char *) grn_get_version();
 static char *mrn_version = (char *) MRN_VERSION;
 
@@ -645,6 +646,13 @@ static bool mrn_dry_write(THD *thd)
   DBUG_RETURN(dry_write_p);
 }
 
+static MYSQL_SYSVAR_STR(default_wrapper_engine, mrn_default_wrapper_engine,
+                        PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
+                        "The default engine for wrapper mode",
+                        NULL,
+                        NULL,
+                        NULL);
+
 static MYSQL_SYSVAR_STR(libgroonga_version, mrn_libgroonga_version,
                         PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
                         "The version of libgroonga",
@@ -665,6 +673,7 @@ struct st_mysql_sys_var *mrn_system_variables[] =
   MYSQL_SYSVAR(log_file),
   MYSQL_SYSVAR(default_parser),
   MYSQL_SYSVAR(dry_write),
+  MYSQL_SYSVAR(default_wrapper_engine),
   MYSQL_SYSVAR(libgroonga_version),
   MYSQL_SYSVAR(version),
   NULL

diff --git a/mrn_table.cc b/mrn_table.cc
@@ -43,6 +43,7 @@
 extern HASH mrn_open_tables;
 extern pthread_mutex_t mrn_open_tables_mutex;
 extern char *mrn_default_parser;
+extern char *mrn_default_wrapper_engine;
 extern handlerton *mrn_hton_ptr;
 extern HASH mrn_allocated_thds;
 extern pthread_mutex_t mrn_allocated_thds_mutex;
@@ -415,6 +416,19 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table)
     }
   }
 
+  if (!share->engine && mrn_default_wrapper_engine)
+  {
+    share->engine_length = strlen(mrn_default_wrapper_engine);
+    if (
+      !(share->engine = mrn_create_string(
+        mrn_default_wrapper_engine,
+        share->engine_length))
+    ) {
+      error = HA_ERR_OUT_OF_MEM;
+      goto error;
+    }
+  }
+
   if (share->engine)
   {
     LEX_STRING engine_name;