null+****@clear*****
null+****@clear*****
2011年 6月 9日 (木) 15:07:51 JST
Kouhei Sutou 2011-06-09 06:07:51 +0000 (Thu, 09 Jun 2011) New Revision: 74c14d8187e444da94c60ec984f9cb02a5c215f6 Log: make buildable with MySQL 5.5.13. fixes #984 Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+8 -0) =================================================================== --- ha_mroonga.cc 2011-06-09 01:36:31 +0000 (6c7edda) +++ ha_mroonga.cc 2011-06-09 06:07:51 +0000 (e55b8b4) @@ -2787,11 +2787,19 @@ int ha_mroonga::reset() DBUG_RETURN(0); } +#if MYSQL_VERSION_ID >= 50513 +handler *ha_mroonga::clone(const char *name, MEM_ROOT *mem_root) +{ + DBUG_ENTER("ha_mroonga::clone"); + DBUG_RETURN(handler::clone(name, mem_root)); +} +#else handler *ha_mroonga::clone(MEM_ROOT *mem_root) { DBUG_ENTER("ha_mroonga::clone"); DBUG_RETURN(handler::clone(mem_root)); } +#endif uint8 ha_mroonga::table_cache_type() { Modified: ha_mroonga.h (+4 -0) =================================================================== --- ha_mroonga.h 2011-06-09 01:36:31 +0000 (ce4536b) +++ ha_mroonga.h 2011-06-09 06:07:51 +0000 (6fdc89d) @@ -173,7 +173,11 @@ public: int reset(); +#if MYSQL_VERSION_ID >= 50513 + handler *clone(const char *name, MEM_ROOT *mem_root); +#else handler *clone(MEM_ROOT *mem_root); +#endif uint8 table_cache_type(); int read_multi_range_first(KEY_MULTI_RANGE **found_range_p, KEY_MULTI_RANGE *ranges,