HAYASHI Kentaro
null+****@clear*****
Fri May 24 12:48:07 JST 2013
HAYASHI Kentaro 2013-05-24 12:48:07 +0900 (Fri, 24 May 2013) New Revision: 2e37d433df2a48281c75f279574d3f11d7755753 https://github.com/mroonga/mroonga/commit/2e37d433df2a48281c75f279574d3f11d7755753 Message: Revert "Don't use FN_LIBCHAR2 with MySQL 5.1" This reverts commit a1291ab6a8973a8d7ca15ccd4641a10f9407b033. Use mrn_mysql_compat header to absorb the difference of MySQL version. Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+0 -4) =================================================================== --- ha_mroonga.cpp 2013-05-24 12:14:34 +0900 (15d794c) +++ ha_mroonga.cpp 2013-05-24 12:48:07 +0900 (0662784) @@ -3790,12 +3790,8 @@ void ha_mroonga::ensure_database_directory() const char *last_path_separator; last_path_separator = strrchr(mrn_database_path_prefix, FN_LIBCHAR); - // For MySQL 5.1. MySQL 5.1 doesn't have FN_LIBCHAR2. - // We will remove this ifdef check after we drop MySQL 5.1 support!!! -#ifdef FN_LIBCHAR2 if (!last_path_separator) last_path_separator = strrchr(mrn_database_path_prefix, FN_LIBCHAR2); -#endif if (!last_path_separator) DBUG_VOID_RETURN; if (mrn_database_path_prefix == last_path_separator) -------------- next part -------------- HTML����������������������������...Download