diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2015-04-30 04:44:30 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2015-04-30 04:44:30 +0900 |
| commit | a0fdb258a435290980993ae025a7fc19c09d2cdb (patch) | |
| tree | 67023cf51c542ed78443d68e9c61b28b39583245 /storage/mroonga/mrn_mysql.h | |
| parent | 060ec5b6b9384456695b6fc903ccfeb8c7ccd298 (diff) | |
| download | mariadb-git-a0fdb258a435290980993ae025a7fc19c09d2cdb.tar.gz | |
Update Mroonga to the latest version on 2015-04-30T04:44:30+0900
Diffstat (limited to 'storage/mroonga/mrn_mysql.h')
| -rw-r--r-- | storage/mroonga/mrn_mysql.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/storage/mroonga/mrn_mysql.h b/storage/mroonga/mrn_mysql.h index cf2a54621bb..644825dcf39 100644 --- a/storage/mroonga/mrn_mysql.h +++ b/storage/mroonga/mrn_mysql.h @@ -47,7 +47,7 @@ # include <mysql_priv.h> # include <mysql/plugin.h> #else -# include <sql_priv.h> +# include <sql_const.h> # include <sql_class.h> # include <probes_mysql.h> # include <sql_partition.h> @@ -58,12 +58,6 @@ # define MRN_MARIADB_P 1 #endif -#if MYSQL_VERSION_ID >= 50607 -# if !defined(MRN_MARIADB_P) -# define MRN_HAVE_SQL_OPTIMIZER_H -# endif -#endif - #define MRN_MESSAGE_BUFFER_SIZE 1024 #define MRN_DBUG_ENTER_FUNCTION() DBUG_ENTER(__FUNCTION__) |