diff options
Diffstat (limited to 'storage/mroonga/ha_mroonga.hpp')
| -rw-r--r-- | storage/mroonga/ha_mroonga.hpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp index 15f972cef82..68c79703903 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 @@ -800,7 +796,7 @@ private: uchar *buf, uint *size); #endif #ifdef MRN_HAVE_MYSQL_TYPE_DATETIME2 - int storage_encode_key_datetime2(Field *field, const uchar *key, + int storage_encode_key_datetime2(Field *field, bool is_null, const uchar *key, uchar *buf, uint *size); #endif #ifdef MRN_HAVE_MYSQL_TYPE_TIME2 |