diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /storage/mroonga/udf/mrn_udf_command.cpp | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'storage/mroonga/udf/mrn_udf_command.cpp')
| -rw-r--r-- | storage/mroonga/udf/mrn_udf_command.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/storage/mroonga/udf/mrn_udf_command.cpp b/storage/mroonga/udf/mrn_udf_command.cpp index ba92e8daa26..d14f3ffd49d 100644 --- a/storage/mroonga/udf/mrn_udf_command.cpp +++ b/storage/mroonga/udf/mrn_udf_command.cpp @@ -25,11 +25,12 @@ #include <mrn_windows.hpp> #include <mrn_macro.hpp> #include <mrn_database_manager.hpp> - -extern mrn::DatabaseManager *mrn_db_manager; +#include <mrn_variables.hpp> MRN_BEGIN_DECLS +extern mrn::DatabaseManager *mrn_db_manager; + struct CommandInfo { grn_ctx ctx; @@ -58,8 +59,8 @@ MRN_API my_bool mroonga_command_init(UDF_INIT *initid, UDF_ARGS *args, initid->maybe_null = 1; initid->const_item = 1; - info = (CommandInfo *)my_malloc(sizeof(CommandInfo), - MYF(MY_WME | MY_ZEROFILL)); + info = (CommandInfo *)mrn_my_malloc(sizeof(CommandInfo), + MYF(MY_WME | MY_ZEROFILL)); if (!info) { strcpy(message, "mroonga_command(): out of memory"); goto error; @@ -67,7 +68,7 @@ MRN_API my_bool mroonga_command_init(UDF_INIT *initid, UDF_ARGS *args, grn_ctx_init(&(info->ctx), 0); { - const char *current_db_path = current_thd->db; + const char *current_db_path = MRN_THD_DB_PATH(current_thd); const char *action; if (current_db_path) { action = "open database"; @@ -100,7 +101,7 @@ error: grn_obj_close(&(info->ctx), info->db); } grn_ctx_fin(&(info->ctx)); - my_free(info, MYF(0)); + my_free(info); } return TRUE; } @@ -163,8 +164,8 @@ MRN_API void mroonga_command_deinit(UDF_INIT *initid) grn_obj_close(&(info->ctx), info->db); } grn_ctx_fin(&(info->ctx)); - info->result.free(); - my_free(info, MYF(0)); + MRN_STRING_FREE(info->result); + my_free(info); } } |