diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
commit | 5091a4ba755250ed8e35f4f5a39a118d476cd8f1 (patch) | |
tree | 370ba468d78204544b56e9d967d8d09e1317a1ed /storage/mroonga/mrn_mysql.h | |
parent | 84eaf0911f311acba797c265ef7508ab6c108b35 (diff) | |
parent | 0880284bf715b4916cc735e19b76d1062c2bfdcf (diff) | |
download | mariadb-git-5091a4ba755250ed8e35f4f5a39a118d476cd8f1.tar.gz |
Merge tag 'mariadb-10.0.19' into 10.1
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__) |