shibakentoku
null+****@clear*****
Fri Nov 22 02:43:39 JST 2013
shibakentoku 2013-11-22 02:43:39 +0900 (Fri, 22 Nov 2013) New Revision: 425acc0910f9d3563658d883df2c0d6ccb20e6bc https://github.com/mroonga/mroonga/commit/425acc0910f9d3563658d883df2c0d6ccb20e6bc Message: Must use thd_test_options() instead of thd->variables.option_bits. refs #1964 Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+1 -6) =================================================================== --- ha_mroonga.cpp 2013-11-21 17:14:36 +0900 (93cdefa) +++ ha_mroonga.cpp 2013-11-22 02:43:39 +0900 (302f97e) @@ -14866,12 +14866,7 @@ bool ha_mroonga::check_written_by_row_based_binlog() #else uint64 option_bits; #endif -#ifdef MRN_OPTION_BITS_IS_UNDER_VARIABLES - option_bits = thd->variables.option_bits; -#else - option_bits = thd->options; -#endif - if (!(option_bits & OPTION_BIN_LOG)) { + if (!thd_test_options(thd, OPTION_BIN_LOG)) { DBUG_RETURN(false); } Modified: ha_mroonga.hpp (+0 -1) =================================================================== --- ha_mroonga.hpp 2013-11-21 17:14:36 +0900 (8797f1c) +++ ha_mroonga.hpp 2013-11-22 02:43:39 +0900 (1fe9a72) @@ -157,7 +157,6 @@ extern "C" { #if MYSQL_VERSION_ID >= 50500 # define MRN_ROW_BASED_CHECK_IS_METHOD -# define MRN_OPTION_BITS_IS_UNDER_VARIABLES #endif #if MYSQL_VERSION_ID >= 50600 -------------- next part -------------- HTML����������������������������...下載
