From e32fbf89241962b0ba884393271e9040ec08fc53 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 26 Sep 2018 18:01:55 +0900 Subject: [PATCH] mariadb10.1: follow the field type change Since MariaDB 10.1.36, the following field in FOREIGN_KEY_INFO is changed. LEX_STRING *update_method -> enum_fk_option update_method --- ha_mroonga.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp index e9c73c977..a81bbffcc 100644 --- a/ha_mroonga.hpp +++ b/ha_mroonga.hpp @@ -233,7 +233,8 @@ extern "C" { # define MRN_HAVE_HTON_ALTER_TABLE_FLAGS #endif -#if MYSQL_VERSION_ID >= 100203 && defined(MRN_MARIADB_P) +#if ((MYSQL_VERSION_ID >= 100203 && defined(MRN_MARIADB_P)) || \ + (MYSQL_VERSION_ID >= 100136 && defined(MRN_MARIADB_P))) # define MRN_FOREIGN_KEY_USE_METHOD_ENUM #endif