Kouhei Sutou
null+****@clear*****
Tue Oct 8 13:06:49 JST 2013
Kouhei Sutou 2013-10-08 13:06:49 +0900 (Tue, 08 Oct 2013) New Revision: af1241f58f774d50488b4a2c31562ee52d9dfb57 https://github.com/mroonga/mroonga/commit/af1241f58f774d50488b4a2c31562ee52d9dfb57 Message: mariadb10.0.4: suppress a warning ha_mroonga.cpp: In function ‘const char* mrn_inspect_extra_function(ha_extra_function)’: ha_mroonga.cpp:258:10: warning: enumeration value ‘HA_EXTRA_EXPORT’ not handled in switch [-Wswitch] switch (operation) { ^ HA_EXTRA_EXPORT is backported to MariaDB from MySQL since MariaDB 10.0.4. Now, mroonga can't build with MariaDB 10.0.{1,2,3}. Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+5 -5) =================================================================== --- ha_mroonga.cpp 2013-10-08 12:57:54 +0900 (7e02c7b) +++ ha_mroonga.cpp 2013-10-08 13:06:49 +0900 (15fa448) @@ -401,6 +401,11 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation) case HA_EXTRA_DETACH_CHILDREN: inspected = "HA_EXTRA_DETACH_CHILDREN"; break; +#ifdef MRN_HAVE_HA_EXTRA_EXPORT + case HA_EXTRA_EXPORT: + inspected = "HA_EXTRA_EXPORT"; + break; +#endif #ifdef MRN_HAVE_HA_EXTRA_DETACH_CHILD case HA_EXTRA_DETACH_CHILD: inspected = "HA_EXTRA_DETACH_CHILD"; @@ -411,11 +416,6 @@ static const char *mrn_inspect_extra_function(enum ha_extra_function operation) inspected = "HA_EXTRA_PREPARE_FOR_FORCED_CLOSE"; break; #endif -#ifdef MRN_HAVE_HA_EXTRA_EXPORT - case HA_EXTRA_EXPORT: - inspected = "HA_EXTRA_EXPORT"; - break; -#endif } return inspected; } Modified: ha_mroonga.hpp (+1 -1) =================================================================== --- ha_mroonga.hpp 2013-10-08 12:57:54 +0900 (0cddd1c) +++ ha_mroonga.hpp 2013-10-08 13:06:49 +0900 (929302a) @@ -117,7 +117,7 @@ extern "C" { # define MRN_HAVE_HA_EXTRA_PREPARE_FOR_FORCED_CLOSE #endif -#if MYSQL_VERSION_ID >= 50607 && !defined(MRN_MARIADB_P) +#if MYSQL_VERSION_ID >= 50607 # define MRN_HAVE_HA_EXTRA_EXPORT #endif -------------- next part -------------- HTML����������������������������...Download
