From a0fdb258a435290980993ae025a7fc19c09d2cdb Mon Sep 17 00:00:00 2001 From: Kentoku SHIBA Date: Thu, 30 Apr 2015 04:44:30 +0900 Subject: Update Mroonga to the latest version on 2015-04-30T04:44:30+0900 --- storage/mroonga/lib/mrn_field_normalizer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'storage/mroonga/lib/mrn_field_normalizer.cpp') diff --git a/storage/mroonga/lib/mrn_field_normalizer.cpp b/storage/mroonga/lib/mrn_field_normalizer.cpp index c34f9975e37..f0b9d921599 100644 --- a/storage/mroonga/lib/mrn_field_normalizer.cpp +++ b/storage/mroonga/lib/mrn_field_normalizer.cpp @@ -17,6 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "mrn_field_normalizer.hpp" #include "mrn_encoding.hpp" @@ -114,6 +116,9 @@ namespace mrn { } else if ((strcmp(charset_info->name, "utf8_unicode_ci") == 0) || (strcmp(charset_info->name, "utf8mb4_unicode_ci") == 0)) { normalizer_name = "NormalizerMySQLUnicodeCI"; + } else if ((strcmp(charset_info->name, "utf8_unicode_520_ci") == 0) || + (strcmp(charset_info->name, "utf8mb4_unicode_520_ci") == 0)) { + normalizer_name = "NormalizerMySQLUnicode520CI"; } grn_obj *normalizer = NULL; @@ -128,7 +133,7 @@ namespace mrn { normalizer_name, charset_info->name, default_normalizer_name); - push_warning(thread_, Sql_condition::WARN_LEVEL_WARN, + push_warning(thread_, MRN_SEVERITY_WARNING, HA_ERR_UNSUPPORTED, error_message); } } -- cgit v1.2.1