null+****@clear*****
null+****@clear*****
2011年 9月 6日 (火) 20:17:28 JST
Kouhei Sutou 2011-09-06 11:17:28 +0000 (Tue, 06 Sep 2011)
New Revision: 23ab11aff079ddaf52557585e850ccd3c201e94d
Log:
support MySQL 5.5.12.
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+3 -1)
===================================================================
--- ha_mroonga.cc 2011-09-03 09:57:33 +0000 (0896106)
+++ ha_mroonga.cc 2011-09-06 11:17:28 +0000 (bc433de)
@@ -6041,8 +6041,9 @@ uint ha_mroonga::alter_table_flags(uint flags)
DBUG_RETURN(res);
}
+#ifdef MRN_HANDLER_HAVE_ADD_INDEX
int ha_mroonga::wrapper_add_index(TABLE *table_arg, KEY *key_info,
- uint num_of_keys, handler_add_index **add)
+ uint num_of_keys, handler_add_index **add)
{
int res = 0;
uint i, j, k;
@@ -6326,6 +6327,7 @@ int ha_mroonga::final_drop_index(TABLE *table_arg)
}
DBUG_RETURN(res);
}
+#endif
void ha_mroonga::set_pk_bitmap()
{
Modified: ha_mroonga.h (+11 -0)
===================================================================
--- ha_mroonga.h 2011-09-03 09:57:33 +0000 (7d67cb4)
+++ ha_mroonga.h 2011-09-06 11:17:28 +0000 (6285f87)
@@ -38,6 +38,11 @@ extern "C" {
# define MRN_HANDLER_CLONE_NEED_NAME 1
#endif
+#if (MYSQL_VERSION_ID >= 50603) || \
+ (MYSQL_VERSION_ID >= 50514)
+# define MRN_HANDLER_HAVE_ADD_INDEX 1
+#endif
+
#if MYSQL_VERSION_ID >= 50600
# define MRN_HANDLER_HAVE_HA_CLOSE 1
# define MRN_HANDLER_HAVE_HA_RND_NEXT 1
@@ -139,7 +144,9 @@ private:
bool ignoring_duplicated_key;
bool fulltext_searching;
+#ifdef MRN_HANDLER_HAVE_ADD_INDEX
handler_add_index *hnd_add_index;
+#endif
public:
ha_mroonga(handlerton *hton, TABLE_SHARE *share);
@@ -275,11 +282,13 @@ 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
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);
int prepare_drop_index(TABLE *table_arg, uint *key_num, uint num_of_keys);
int final_drop_index(TABLE *table_arg);
+#endif
protected:
#ifdef MRN_HANDLER_HAVE_HA_RND_NEXT
@@ -535,6 +544,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
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,
@@ -547,6 +557,7 @@ private:
uint num_of_keys);
int wrapper_final_drop_index(TABLE *table_arg);
int storage_final_drop_index(TABLE *table_arg);
+#endif
};
#ifdef __cplusplus