mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Update Mroonga to the latest version on 2015-04-30T04:44:30+0900
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <mrn_mysql.h>
|
||||
|
||||
#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);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user