Kouhei Sutou
null+****@clear*****
Sat Dec 21 18:27:04 JST 2013
Kouhei Sutou 2013-12-21 18:27:04 +0900 (Sat, 21 Dec 2013) New Revision: 6f7f1fcf492f13a3ec7a722dc4e5160c33e650ca https://github.com/mroonga/mroonga/commit/6f7f1fcf492f13a3ec7a722dc4e5160c33e650ca Message: Add missing cursor_clear() call on ft_end() But ft_end() is not called. So this doesn't change any the current behaviors. It may be a MySQL bug... Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+9 -2) =================================================================== --- ha_mroonga.cpp 2013-12-20 11:22:01 +0900 (5ee7cf5) +++ ha_mroonga.cpp 2013-12-21 18:27:04 +0900 (d41ae0a) @@ -7343,17 +7343,24 @@ int ha_mroonga::ft_init() DBUG_RETURN(error); } +void ha_mroonga::generic_ft_end() +{ + MRN_DBUG_ENTER_METHOD(); + clear_cursor(); + DBUG_VOID_RETURN; +} + void ha_mroonga::wrapper_ft_end() { MRN_DBUG_ENTER_METHOD(); - handler::ft_end(); + generic_ft_end(); DBUG_VOID_RETURN; } void ha_mroonga::storage_ft_end() { MRN_DBUG_ENTER_METHOD(); - handler::ft_end(); + generic_ft_end(); DBUG_VOID_RETURN; } Modified: ha_mroonga.hpp (+1 -0) =================================================================== --- ha_mroonga.hpp 2013-12-20 11:22:01 +0900 (2e40822) +++ ha_mroonga.hpp 2013-12-21 18:27:04 +0900 (f8624bf) @@ -858,6 +858,7 @@ private: int generic_ft_init(); int wrapper_ft_init(); int storage_ft_init(); + void generic_ft_end(); void wrapper_ft_end(); void storage_ft_end(); FT_INFO *wrapper_ft_init_ext(uint flags, uint key_nr, String *key); -------------- next part -------------- HTML����������������������������...Download