[Groonga-mysql-commit] mroonga/mroonga [master] mysql56: include sql_optimizer.h for 'class JOIN'

Back to archive index

Kouhei Sutou null+****@clear*****
Mon Nov 19 12:04:15 JST 2012


Kouhei Sutou	2012-11-19 12:04:15 +0900 (Mon, 19 Nov 2012)

  New Revision: e51f4d5587700f666da7c23c35d6a40779cb6dbf
  https://github.com/mroonga/mroonga/commit/e51f4d5587700f666da7c23c35d6a40779cb6dbf

  Log:
    mysql56: include sql_optimizer.h for 'class JOIN'

  Modified files:
    ha_mroonga.cpp
    mrn_mysql.h

  Modified: ha_mroonga.cpp (+4 -0)
===================================================================
--- ha_mroonga.cpp    2012-11-19 12:01:15 +0900 (3d326a2)
+++ ha_mroonga.cpp    2012-11-19 12:04:15 +0900 (d66c6c9)
@@ -31,6 +31,10 @@
 #  include <key.h>
 #endif
 
+#ifdef MRN_HAVE_SQL_OPTIMIZER_H
+#  include <sql_optimizer.h>
+#endif
+
 #include <sql_select.h>
 #include <ft_global.h>
 #include <spatial.h>

  Modified: mrn_mysql.h (+4 -0)
===================================================================
--- mrn_mysql.h    2012-11-19 12:01:15 +0900 (ecff6c5)
+++ mrn_mysql.h    2012-11-19 12:04:15 +0900 (551a658)
@@ -58,6 +58,10 @@
 #  define MRN_MARIADB_P 1
 #endif
 
+#if MYSQL_VERSION_ID >= 50607
+#  define MRN_HAVE_SQL_OPTIMIZER_H
+#endif
+
 #define MRN_MESSAGE_BUFFER_SIZE 1024
 
 #define MRN_DBUG_ENTER_FUNCTION() DBUG_ENTER(__FUNCTION__)
-------------- next part --------------
HTML����������������������������...
下載 



More information about the Groonga-mysql-commit mailing list
Back to archive index