diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
| commit | 31081593aabb116b6d8f86b6c7e76126edb392b4 (patch) | |
| tree | 767a069f255359b5ea37e7c491dfeacf6e519fad /storage/mroonga | |
| parent | b0026e33af8fc3b25a42099c096a84591fd550e2 (diff) | |
| parent | 3a4242fd57b3a2235d2478ed080941b67a82ad1b (diff) | |
| download | mariadb-git-31081593aabb116b6d8f86b6c7e76126edb392b4.tar.gz | |
Merge branch '11.0' into 10.1
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/ha_mroonga.cpp | 7 | ||||
| -rw-r--r-- | storage/mroonga/ha_mroonga.hpp | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index cbf902b7c0e..d317fef44fb 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -16761,15 +16761,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 |