null+****@clear*****
null+****@clear*****
2012年 3月 13日 (火) 09:58:05 JST
Kouhei Sutou 2012-03-13 09:58:05 +0900 (Tue, 13 Mar 2012)
New Revision: 1f2774caae82b2db93b849aa6227ecafe1d3445f
Log:
mysql5.6: make buidable again
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+2 -0)
===================================================================
--- ha_mroonga.cc 2012-03-13 00:20:50 +0900 (2a64667)
+++ ha_mroonga.cc 2012-03-13 09:58:05 +0900 (5c4e084)
@@ -11665,6 +11665,7 @@ char *ha_mroonga::get_foreign_key_create_info()
DBUG_RETURN(res);
}
+#ifdef MRN_HANDLER_HAVE_GET_TABLESPACE_NAME
char *ha_mroonga::wrapper_get_tablespace_name(THD *thd, char *name,
uint name_len)
{
@@ -11698,6 +11699,7 @@ char *ha_mroonga::get_tablespace_name(THD *thd, char *name, uint name_len)
}
DBUG_RETURN(res);
}
+#endif
bool ha_mroonga::wrapper_can_switch_engines()
{
Modified: ha_mroonga.h (+8 -0)
===================================================================
--- ha_mroonga.h 2012-03-13 00:20:50 +0900 (994bf66)
+++ ha_mroonga.h 2012-03-13 09:58:05 +0900 (577b7fe)
@@ -76,6 +76,10 @@ extern "C" {
# define MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST
#endif
+#if (MYSQL_VERSION_ID < 50600)
+# define MRN_HANDLER_HAVE_GET_TABLESPACE_NAME 1
+#endif
+
#if MYSQL_VERSION_ID >= 50500
# define MRN_TABLE_LIST_INIT_REQUIRE_ALIAS
#endif
@@ -415,7 +419,9 @@ protected:
bool primary_key_is_clustered();
bool is_fk_defined_on_table_or_index(uint index);
char *get_foreign_key_create_info();
+#ifdef MRN_HANDLER_HAVE_GET_TABLESPACE_NAME
char *get_tablespace_name(THD *thd, char *name, uint name_len);
+#endif
bool can_switch_engines();
int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
#ifdef MRN_HANDLER_HAVE_GET_PARENT_FOREIGN_KEY_LIST
@@ -884,8 +890,10 @@ private:
bool storage_is_fk_defined_on_table_or_index(uint index);
char *wrapper_get_foreign_key_create_info();
char *storage_get_foreign_key_create_info();
+#ifdef MRN_HANDLER_HAVE_GET_TABLESPACE_NAME
char *wrapper_get_tablespace_name(THD *thd, char *name, uint name_len);
char *storage_get_tablespace_name(THD *thd, char *name, uint name_len);
+#endif
bool wrapper_can_switch_engines();
bool storage_can_switch_engines();
int wrapper_get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);