Must use thd_test_options() instead of thd->variables.option_bits. re…

…fs #1964
mroonga · Nov 21, 2013 · 425acc0 · 425acc0
1 parent a16b8c5
commit 425acc0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -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);
   }
 

diff --git a/ha_mroonga.hpp b/ha_mroonga.hpp
@@ -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