null+****@clear*****
null+****@clear*****
2011年 11月 27日 (日) 21:41:48 JST
Kouhei Sutou 2011-11-27 12:41:48 +0000 (Sun, 27 Nov 2011)
New Revision: d6b03243cf7aa5db6595345b228d094db9a7f3c1
Log:
fix macro name.
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+8 -8)
===================================================================
--- ha_mroonga.cc 2011-11-27 12:32:12 +0000 (2d00083)
+++ ha_mroonga.cc 2011-11-27 12:41:48 +0000 (bddb60e)
@@ -7772,7 +7772,7 @@ uint ha_mroonga::alter_table_flags(uint flags)
DBUG_RETURN(res);
}
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
uint num_of_keys, handler_add_index **add)
#else
@@ -7812,7 +7812,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
(const uchar *) share->table_name,
(const uchar *) share->table_name + share->table_name_length);
mrn_table_name_gen(decode_name, grn_table_name);
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
hnd_add_index = NULL;
#endif
bitmap_clear_all(table->read_set);
@@ -7923,7 +7923,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
{
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
res = wrap_handler->add_index(table_arg, wrap_key_info, j, &hnd_add_index);
#else
res = wrap_handler->add_index(table_arg, wrap_key_info, j);
@@ -7944,7 +7944,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
}
}
}
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
else {
*add = new handler_add_index(table_arg, key_info, num_of_keys);
}
@@ -7954,7 +7954,7 @@ int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
DBUG_RETURN(res);
}
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info,
uint num_of_keys, handler_add_index **add)
#else
@@ -8031,7 +8031,7 @@ int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info,
}
}
}
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
else {
*add = new handler_add_index(table_arg, key_info, num_of_keys);
}
@@ -8094,7 +8094,7 @@ int ha_mroonga::storage_add_index_multiple_columns(KEY *key_info,
DBUG_RETURN(error);
}
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::add_index(TABLE *table_arg, KEY *key_info,
uint num_of_keys, handler_add_index **add)
{
@@ -8124,7 +8124,7 @@ int ha_mroonga::add_index(TABLE *table_arg, KEY *key_info,
}
#endif
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int ha_mroonga::wrapper_final_add_index(handler_add_index *add, bool commit)
{
int res = 0;
Modified: ha_mroonga.h (+5 -5)
===================================================================
--- ha_mroonga.h 2011-11-27 12:32:12 +0000 (5c8b7af)
+++ ha_mroonga.h 2011-11-27 12:41:48 +0000 (08fd8bc)
@@ -41,7 +41,7 @@ extern "C" {
#if (MYSQL_VERSION_ID >= 50603) || \
(MYSQL_VERSION_ID >= 50514)
-# define MRN_HANDLER_HAVE_ADD_INDEX 1
+# define MRN_HANDLER_HAVE_FINAL_ADD_INDEX 1
#endif
#if (MYSQL_VERSION_ID >= 50603) || \
@@ -160,7 +160,7 @@ private:
bool ignoring_duplicated_key;
bool fulltext_searching;
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
handler_add_index *hnd_add_index;
#endif
@@ -307,7 +307,7 @@ public:
bool check_if_incompatible_data(HA_CREATE_INFO *create_info,
uint table_changes);
uint alter_table_flags(uint flags);
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys,
handler_add_index **add);
int final_add_index(handler_add_index *add, bool commit);
@@ -643,7 +643,7 @@ private:
uint table_changes);
uint wrapper_alter_table_flags(uint flags);
uint storage_alter_table_flags(uint flags);
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int wrapper_add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys,
handler_add_index **add);
int storage_add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys,
@@ -654,7 +654,7 @@ private:
#endif
int storage_add_index_multiple_columns(KEY *key_info, uint num_of_keys,
grn_obj **index_columns);
-#ifdef MRN_HANDLER_HAVE_ADD_INDEX
+#ifdef MRN_HANDLER_HAVE_FINAL_ADD_INDEX
int wrapper_final_add_index(handler_add_index *add, bool commit);
int storage_final_add_index(handler_add_index *add, bool commit);
#endif