diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
| commit | 28f08d3753eb10a1393a63e6c581d43aad9f93b9 (patch) | |
| tree | 86c9df8c3fb6d4ebd99d431697c84f06ef242989 /storage/mroonga | |
| parent | 38665893087e20c3ad65d5b0e227a75185a4865e (diff) | |
| parent | f1bcfbb4373e40dda2c18c137f76fc6ff32e1a45 (diff) | |
| download | mariadb-git-28f08d3753eb10a1393a63e6c581d43aad9f93b9.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/ha_mroonga.cpp | 9 | ||||
| -rw-r--r-- | storage/mroonga/ha_mroonga.hpp | 4 | ||||
| -rw-r--r-- | storage/mroonga/vendor/groonga/lib/expr.c | 2 |
3 files changed, 2 insertions, 13 deletions
diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index b4bfc152053..c03f1258bb8 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -9196,7 +9196,7 @@ void ha_mroonga::remove_related_files(const char *base_path) if (stat(entry->d_name, &file_status) != 0) { continue; } - if (!((file_status.st_mode & S_IFMT) && S_IFREG)) { + if (!((file_status.st_mode & S_IFMT) == S_IFREG)) { continue; } if (strncmp(entry->d_name, base_path, base_path_length) == 0) { @@ -16771,15 +16771,8 @@ int ha_mroonga::storage_get_foreign_key_list(THD *thd, ref_table_buff, ref_table_name_length, TRUE); -#ifdef MRN_FOREIGN_KEY_USE_METHOD_ENUM f_key_info.update_method = FK_OPTION_RESTRICT; f_key_info.delete_method = FK_OPTION_RESTRICT; -#else - f_key_info.update_method = thd_make_lex_string(thd, NULL, "RESTRICT", - 8, TRUE); - f_key_info.delete_method = thd_make_lex_string(thd, NULL, "RESTRICT", - 8, TRUE); -#endif f_key_info.referenced_key_name = thd_make_lex_string(thd, NULL, "PRIMARY", 7, TRUE); LEX_STRING *field_name = thd_make_lex_string(thd, diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp index 2533913961e..b769583d434 100644 --- a/storage/mroonga/ha_mroonga.hpp +++ b/storage/mroonga/ha_mroonga.hpp @@ -211,10 +211,6 @@ extern "C" { # define MRN_FOREIGN_KEY_USE_CONST_STRING #endif -#if MYSQL_VERSION_ID >= 100203 && defined(MRN_MARIADB_P) -# define MRN_FOREIGN_KEY_USE_METHOD_ENUM -#endif - #if MYSQL_VERSION_ID < 50706 || defined(MRN_MARIADB_P) # define MRN_HANDLER_IS_FATAL_ERROR_HAVE_FLAGS #endif diff --git a/storage/mroonga/vendor/groonga/lib/expr.c b/storage/mroonga/vendor/groonga/lib/expr.c index 515dbe068d7..5b1d01678b0 100644 --- a/storage/mroonga/vendor/groonga/lib/expr.c +++ b/storage/mroonga/vendor/groonga/lib/expr.c @@ -4984,7 +4984,7 @@ grn_scan_info_build_full(grn_ctx *ctx, grn_obj *expr, int *n, next_code_op = -1; for (i = 0, stat = SCAN_START, c = e->codes, ce = &e->codes[e->codes_curr]; c < ce; c++) { grn_operator code_op; - if (next_code_op == -1) { + if (next_code_op == (grn_operator)-1) { code_op = c->op; } else { code_op = next_code_op; |