Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:35:52 JST 2012
Kouhei Sutou 2012-01-23 16:10:57 +0900 (Mon, 23 Jan 2012) New Revision: 9be0d73929327182a176fe6f3bed316bda16740e https://github.com/mroonga/mroonga/commit/9be0d73929327182a176fe6f3bed316bda16740e Log: [storage] remove a needless flag. refs #1212 Modified files: ha_mroonga.cc ha_mroonga.h Modified: ha_mroonga.cc (+1 -14) =================================================================== --- ha_mroonga.cc 2012-01-23 15:51:15 +0900 (458b903) +++ ha_mroonga.cc 2012-01-23 16:10:57 +0900 (8ebf676) @@ -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); } Modified: ha_mroonga.h (+0 -1) =================================================================== --- ha_mroonga.h 2012-01-23 15:51:15 +0900 (c0be9ca) +++ ha_mroonga.h 2012-01-23 16:10:57 +0900 (74e80f1) @@ -192,7 +192,6 @@ private: #endif bool ignoring_no_key_columns; - bool keyread; public: ha_mroonga(handlerton *hton, TABLE_SHARE *share_arg); -------------- next part -------------- HTML����������������������������...Download