[Groonga-mysql-commit] mroonga/mroonga at 5ff01eb [master] Fix Percona detection

Back to archive index

Kouhei Sutou null+****@clear*****
Mon Feb 5 09:56:04 JST 2018


Kouhei Sutou	2018-02-05 09:56:04 +0900 (Mon, 05 Feb 2018)

  New Revision: 5ff01eb6ea1c5ba328e2295504314e463605ecde
  https://github.com/mroonga/mroonga/commit/5ff01eb6ea1c5ba328e2295504314e463605ecde

  Message:
    Fix Percona detection

  Modified files:
    ha_mroonga.hpp
    mrn_mysql.h

  Modified: ha_mroonga.hpp (+1 -1)
===================================================================
--- ha_mroonga.hpp    2018-02-05 08:54:59 +0900 (19e5693e)
+++ ha_mroonga.hpp    2018-02-05 09:56:04 +0900 (a3f11366)
@@ -270,7 +270,7 @@ extern "C" {
 #  define MRN_HANDLER_HA_UPDATE_ROW_NEW_DATA_CONST
 #endif
 
-#if MYSQL_VERSION_ID >= 50718 && defined(MRN_PERCONA_P)
+#ifdef MRN_PERCONA_P
 #  define MRN_HANDLER_HAVE_HAS_GAP_LOCKS
 #endif
 

  Modified: mrn_mysql.h (+4 -3)
===================================================================
--- mrn_mysql.h    2018-02-05 08:54:59 +0900 (2c62f41b)
+++ mrn_mysql.h    2018-02-05 09:56:04 +0900 (66f565e5)
@@ -43,14 +43,15 @@
 #define MYSQL_SERVER 1
 #include <mysql_version.h>
 
+#include <sql_plugin.h>
+#include <my_default.h>
+
 #ifdef MARIADB_BASE_VERSION
 #  define MRN_MARIADB_P 1
-#elif FIRST_SUPPORTED_COMPRESSED_COLUMNS_VERSION
+#elif defined(FIRST_SUPPORTED_COMPRESSED_COLUMNS_VERSION)
 #  define MRN_PERCONA_P 1
 #endif
 
-#include <sql_plugin.h>
-
 #include <sql_const.h>
 #include <sql_class.h>
 #if (!defined(MRN_MARIADB_P) && MYSQL_VERSION_ID < 80002)
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180205/eda91053/attachment.htm 



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