mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Update Mroonga to the latest version on 2014-10-21T04:51:38+0900
This commit is contained in:
@@ -153,7 +153,27 @@ namespace mrn {
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
bool set(grn_ctx *ctx, const CHARSET_INFO *charset) {
|
||||
int set(grn_ctx *ctx, const CHARSET_INFO *charset) {
|
||||
MRN_DBUG_ENTER_FUNCTION();
|
||||
int error = 0;
|
||||
|
||||
if (!set_raw(ctx, charset)) {
|
||||
const char *name = "<null>";
|
||||
const char *csname = "<null>";
|
||||
if (charset) {
|
||||
name = charset->name;
|
||||
csname = charset->csname;
|
||||
}
|
||||
error = ER_MRN_CHARSET_NOT_SUPPORT_NUM;
|
||||
my_printf_error(error,
|
||||
ER_MRN_CHARSET_NOT_SUPPORT_STR,
|
||||
MYF(0), name, csname);
|
||||
}
|
||||
|
||||
DBUG_RETURN(error);
|
||||
}
|
||||
|
||||
bool set_raw(grn_ctx *ctx, const CHARSET_INFO *charset) {
|
||||
MRN_DBUG_ENTER_FUNCTION();
|
||||
if (!charset)
|
||||
{
|
||||
|
Reference in New Issue
Block a user