[storage] remove a needless flag. refs #1212

mroonga · Jan 23, 2012 · 9be0d73 · 9be0d73
1 parent 3c53f50
commit 9be0d73
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -1883,7 +1883,6 @@ ha_mroonga::ha_mroonga(handlerton *hton, TABLE_SHARE *share_arg)
   wrap_handler = NULL;
   matched_record_keys = NULL;
   fulltext_searching = FALSE;
-  keyread = FALSE;
   mrn_lock_type = F_UNLCK;
   GRN_TEXT_INIT(&key_buffer, 0);
   GRN_TEXT_INIT(&encoded_key_buffer, 0);
@@ -3942,17 +3941,6 @@ int ha_mroonga::wrapper_extra(enum ha_extra_function operation)
 int ha_mroonga::storage_extra(enum ha_extra_function operation)
 {
   MRN_DBUG_ENTER_METHOD();
-  switch (operation)
-  {
-    case HA_EXTRA_KEYREAD:
-      keyread = TRUE;
-      break;
-    case HA_EXTRA_NO_KEYREAD:
-      keyread = FALSE;
-      break;
-    default:
-      break;
-  }
   DBUG_RETURN(0);
 }
 
@@ -6666,7 +6654,7 @@ int ha_mroonga::storage_get_next_record(uchar *buf)
     DBUG_RETURN(HA_ERR_END_OF_FILE);
   }
   if (buf) {
-    if (keyread)
+    if (ignoring_no_key_columns)
       storage_store_fields_by_index(buf);
     else
       storage_store_fields(buf, record_id);
@@ -7263,7 +7251,6 @@ int ha_mroonga::wrapper_reset()
 int ha_mroonga::storage_reset()
 {
   MRN_DBUG_ENTER_METHOD();
-  keyread = FALSE;
   DBUG_RETURN(0);
 }
 

diff --git a/ha_mroonga.h b/ha_mroonga.h
@@ -192,7 +192,6 @@ class ha_mroonga: public handler
 #endif
 
   bool ignoring_no_key_columns;
-  bool keyread;
 
 public:
   ha_mroonga(handlerton *hton, TABLE_SHARE *share_arg);