Kouhei Sutou
null+****@clear*****
Sun Jun 21 22:53:17 JST 2015
Kouhei Sutou 2015-06-21 22:53:17 +0900 (Sun, 21 Jun 2015) New Revision: 99bcd5205325da0c8baa1d018769f3b5d6b29abd https://github.com/mroonga/mroonga/commit/99bcd5205325da0c8baa1d018769f3b5d6b29abd Message: Remove code for MySQL <= 5.5.15 Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+1 -5) =================================================================== --- ha_mroonga.cpp 2015-06-21 22:51:39 +0900 (89df2ec) +++ ha_mroonga.cpp 2015-06-21 22:53:17 +0900 (acebedb) @@ -167,11 +167,7 @@ static mysql_mutex_t *mrn_LOCK_open; #else # define mrn_declare_plugin(NAME) mysql_declare_plugin(NAME) # define mrn_declare_plugin_end mysql_declare_plugin_end -# ifdef MRN_PLUGIN_HAVE_FLAGS -# define MRN_PLUGIN_LAST_VALUES NULL, 0 -# else -# define MRN_PLUGIN_LAST_VALUES NULL -# endif +# define MRN_PLUGIN_LAST_VALUES NULL, 0 #endif #if MYSQL_VERSION_ID >= 100007 && defined(MRN_MARIADB_P) Modified: mrn_mysql_compat.h (+0 -4) =================================================================== --- mrn_mysql_compat.h 2015-06-21 22:51:39 +0900 (e776891) +++ mrn_mysql_compat.h 2015-06-21 22:53:17 +0900 (1e098db) @@ -38,10 +38,6 @@ # endif #endif -#if MYSQL_VERSION_ID >= 50516 -# define MRN_PLUGIN_HAVE_FLAGS 1 -#endif - // for MySQL < 5.5 #ifndef MY_ALL_CHARSETS_SIZE # define MY_ALL_CHARSETS_SIZE 256 -------------- next part -------------- HTML����������������������������...ダウンロード
