null+****@clear*****
null+****@clear*****
2011年 7月 13日 (水) 16:01:21 JST
Kouhei Sutou 2011-07-13 07:01:21 +0000 (Wed, 13 Jul 2011)
New Revision: a6f9bb822b05558e0b8c6aa6624c14e5d14e8fac
Log:
[wrapper] fix crash on ft_read(). fixes #1032
index should be initialized before index_read_map().
Modified files:
ha_mroonga.cc
Modified: ha_mroonga.cc (+5 -3)
===================================================================
--- ha_mroonga.cc 2011-07-13 07:00:05 +0000 (db2799c)
+++ ha_mroonga.cc 2011-07-13 07:01:21 +0000 (73c0c05)
@@ -4367,9 +4367,11 @@ int ha_mroonga::wrapper_ft_read(uchar *buf)
GRN_TEXT_VALUE(&(pkey)), table->key_info->key_length);
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
- error = wrap_handler->index_read_map(
- buf, (uchar *) GRN_TEXT_VALUE(&(pkey)), pk_keypart_map,
- HA_READ_KEY_EXACT);
+ error = wrap_handler->index_read_idx_map(buf,
+ share->wrap_primary_key,
+ (uchar *)GRN_TEXT_VALUE(&(pkey)),
+ pk_keypart_map,
+ HA_READ_KEY_EXACT);
MRN_SET_BASE_SHARE_KEY(share, table->s);
MRN_SET_BASE_TABLE_KEY(this, table);
}