database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Update Mroonga to the latest version on 2015-04-30T04:44:30+0900

Browse Source
This commit is contained in:
Kentoku SHIBA
2015-04-30 04:44:30 +09:00
parent 060ec5b6b9
commit a0fdb258a4
413 changed files with 25921 additions and 5286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
storage/mroonga/udf/mrn_udf_snippet.cpp
View File

@@ -26,6 +26,7 @@
#include <mrn_windows.hpp>
#include <mrn_table.hpp>
#include <mrn_macro.hpp>
#include <mrn_variables.hpp>
MRN_BEGIN_DECLS
@@ -170,8 +171,8 @@ MRN_API my_bool mroonga_snippet_init(UDF_INIT *initid, UDF_ARGS *args, char *mes
initid->maybe_null = 1;
initid->const_item = 1;
if (!(snip_info = (st_mrn_snip_info *) my_malloc(sizeof(st_mrn_snip_info),
MYF(MY_WME | MY_ZEROFILL))))
if (!(snip_info = (st_mrn_snip_info *) mrn_my_malloc(sizeof(st_mrn_snip_info),
MYF(MY_WME | MY_ZEROFILL))))
{
strcpy(message, "mroonga_snippet() out of memory");
goto error;
@@ -292,7 +293,7 @@ MRN_API void mroonga_snippet_deinit(UDF_INIT *initid)
if (snip_info->snippet) {
grn_obj_close(&snip_info->ctx, snip_info->snippet);
}
snip_info->result_str.free();
MRN_STRING_FREE(snip_info->result_str);
grn_obj_close(&snip_info->ctx, grn_ctx_db(&snip_info->ctx));
grn_ctx_fin(&snip_info->ctx);
my_free(snip_info);