diff options
Diffstat (limited to 'storage/oqgraph/oqgraph_thunk.cc')
| -rw-r--r-- | storage/oqgraph/oqgraph_thunk.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/oqgraph/oqgraph_thunk.cc b/storage/oqgraph/oqgraph_thunk.cc index 5d3f03beaf8..bd577ecfc12 100644 --- a/storage/oqgraph/oqgraph_thunk.cc +++ b/storage/oqgraph/oqgraph_thunk.cc @@ -109,7 +109,7 @@ const std::string& oqgraph3::cursor::record_position() const if (_graph->_cursor->_index >= 0) { key_copy((uchar*) _graph->_cursor->_key.data(), table.record[0], - table.s->key_info + _index, table.s->key_info[_index].key_length, true); + table.key_info + _index, table.key_info[_index].key_length, true); } _graph->_stale= false; @@ -184,7 +184,7 @@ int oqgraph3::cursor::restore_position() if (int rc= table.file->ha_index_read_map( table.record[0], (const uchar*) _key.data(), (key_part_map)(1 << _parts) - 1, - table.s->key_info[_index].user_defined_key_parts == _parts ? + table.key_info[_index].user_defined_key_parts == _parts ? HA_READ_KEY_EXACT : HA_READ_KEY_OR_NEXT)) { table.file->ha_index_end(); @@ -368,7 +368,7 @@ int oqgraph3::cursor::seek_to( if (!destid) { int i= 0; - for( ::KEY *key_info= table.s->key_info, + for( ::KEY *key_info= table.key_info, *key_end= key_info + table.s->keys; key_info < key_end; ++key_info, ++i) { @@ -399,7 +399,7 @@ int oqgraph3::cursor::seek_to( else if (!origid) { int i= 0; - for( ::KEY *key_info= table.s->key_info, + for( ::KEY *key_info= table.key_info, *key_end= key_info + table.s->keys; key_info < key_end; ++key_info, ++i) { @@ -430,7 +430,7 @@ int oqgraph3::cursor::seek_to( else { int i= 0; - for( ::KEY *key_info= table.s->key_info, + for( ::KEY *key_info= table.key_info, *key_end= key_info + table.s->keys; key_info < key_end; ++key_info, ++i) { @@ -485,7 +485,7 @@ int oqgraph3::cursor::seek_to( if (int rc= table.file->ha_index_read_map( table.record[0], (uchar*) _key.data(), (key_part_map) ((1U << _parts) - 1), - table.s->key_info[_index].user_defined_key_parts == _parts ? + table.key_info[_index].user_defined_key_parts == _parts ? HA_READ_KEY_EXACT : HA_READ_KEY_OR_NEXT)) { table.file->ha_index_end(); |