Kouhei Sutou
null+****@clear*****
Sat Mar 14 23:49:02 JST 2015
Kouhei Sutou 2015-03-14 23:49:02 +0900 (Sat, 14 Mar 2015) New Revision: cbfeae15635eb7846ba4c5a4820db123fa00db4b https://github.com/mroonga/mroonga/commit/cbfeae15635eb7846ba4c5a4820db123fa00db4b Message: mysql57: follow enum thr_lock_type change Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+7 -0) =================================================================== --- ha_mroonga.cpp 2015-03-14 23:43:14 +0900 (d09ea35) +++ ha_mroonga.cpp 2015-03-14 23:49:02 +0900 (2fdcf41) @@ -297,12 +297,19 @@ static const char *mrn_inspect_thr_lock_type(enum thr_lock_type lock_type) inspected = "TL_WRITE_ALLOW_READ"; break; #endif +#ifdef MRN_HAVE_TL_WRITE_CONCURRENT_DEFAULT + case TL_WRITE_CONCURRENT_DEFAULT: + inspected = "TL_WRITE_CONCURRENT_DEFAULT"; + break; +#endif case TL_WRITE_CONCURRENT_INSERT: inspected = "TL_WRITE_CONCURRENT_INSERT"; break; +#ifdef MRN_HAVE_TL_WRITE_DELAYED case TL_WRITE_DELAYED: inspected = "TL_WRITE_DELAYED"; break; +#endif case TL_WRITE_DEFAULT: inspected = "TL_WRITE_DEFAULT"; break; Modified: ha_mroonga.hpp (+8 -0) =================================================================== --- ha_mroonga.hpp 2015-03-14 23:43:14 +0900 (d975a0d) +++ ha_mroonga.hpp 2015-03-14 23:49:02 +0900 (9f2d373) @@ -145,6 +145,14 @@ extern "C" { # define MRN_HAVE_TL_WRITE_ALLOW_READ #endif +#if MYSQL_VERSION_ID < 50706 && !defined(MRN_MARIADB_P) +# define MRN_HAVE_TL_WRITE_DELAYED +#endif + +#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) +# define MRN_HAVE_TL_WRITE_CONCURRENT_DEFAULT +#endif + #if (defined(MRN_MARIADB_P) && \ ((MYSQL_VERSION_ID >= 50306 && MYSQL_VERSION_ID < 50500) || \ MYSQL_VERSION_ID >= 50523)) -------------- next part -------------- HTML����������������������������...Download