Commit 69ca6346 authored by Andrew McDonnell's avatar Andrew McDonnell

Deal with properly

parent 653659fa
...@@ -882,7 +882,10 @@ int ha_oqgraph::index_read_idx(byte * buf, uint index, const byte * key, ...@@ -882,7 +882,10 @@ int ha_oqgraph::index_read_idx(byte * buf, uint index, const byte * key,
// so we pass the string now. // so we pass the string now.
// In the future we should refactor parse_latch_string_to_legacy_int() // In the future we should refactor parse_latch_string_to_legacy_int()
// into oqgraph instead. // into oqgraph instead.
if (latchp)
graph->retainLatchFieldValue(latchFieldValue.c_ptr_safe()); graph->retainLatchFieldValue(latchFieldValue.c_ptr_safe());
else
graph->retainLatchFieldValue(NULL);
DBUG_PRINT( "oq-debug", ("index_read_idx ::>> search(latch:%s,%ld,%ld)", DBUG_PRINT( "oq-debug", ("index_read_idx ::>> search(latch:%s,%ld,%ld)",
...@@ -1095,7 +1098,7 @@ ha_rows ha_oqgraph::records_in_range(uint inx, key_range *min_key, ...@@ -1095,7 +1098,7 @@ ha_rows ha_oqgraph::records_in_range(uint inx, key_range *min_key,
min_key->flag != HA_READ_KEY_EXACT || min_key->flag != HA_READ_KEY_EXACT ||
max_key->flag != HA_READ_AFTER_KEY) max_key->flag != HA_READ_AFTER_KEY)
{ {
if (min_key->length == key->key_part[0].store_length) if (min_key->length == key->key_part[0].store_length && !key->key_part[0].field->is_null()) /* ensure select * from x where latch is null is consistent with no latch */
{ {
// If latch is not null and equals 0, return # nodes // If latch is not null and equals 0, return # nodes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment