add MRN_TABLE_LIST_INIT_REQUIRE_ALIAS.

mroonga · Nov 26, 2011 · bef0654 · bef0654
1 parent 731b9fb
commit bef0654
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -2815,7 +2815,7 @@ int ha_mroonga::delete_table(const char *name)
   }
   if (!tmp_table_share)
   {
-#if MYSQL_VERSION_ID >= 50500
+#ifdef MRN_TABLE_LIST_INIT_REQUIRE_ALIAS
     table_list.init_one_table(db_name, strlen(db_name),
                               tbl_name, strlen(tbl_name), tbl_name, TL_WRITE);
 #else
@@ -7296,7 +7296,7 @@ int ha_mroonga::rename_table(const char *from, const char *to)
   if (strcmp(from_db_name, to_db_name))
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 
-#if MYSQL_VERSION_ID >= 50500
+#ifdef MRN_TABLE_LIST_INIT_REQUIRE_ALIAS
   table_list.init_one_table(from_db_name, strlen(from_db_name),
                             from_tbl_name, strlen(from_tbl_name),
                             from_tbl_name, TL_WRITE);

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -78,6 +78,10 @@ extern "C" {
 #  define MRN_HANDLER_HAVE_TRUNCATE
 #endif
 
+#if MYSQL_VERSION_ID >= 50500
+#  define MRN_TABLE_LIST_INIT_REQUIRE_ALIAS
+#endif
+
 #if MYSQL_VERSION_ID < 50600
   typedef Item COND;
 #endif