Commit fd800f14 authored by Sergey Petrunya's avatar Sergey Petrunya

Valgrind fix for the previous cset:

- {ha_myisam,ha_maria}::index_read_idx_map should also initialize end_range, because index condition 
  function will attempt to check it. We initialize it like index_init() does.
parent d1df0b58
...@@ -2261,6 +2261,7 @@ int ha_maria::index_read_idx_map(uchar * buf, uint index, const uchar * key, ...@@ -2261,6 +2261,7 @@ int ha_maria::index_read_idx_map(uchar * buf, uint index, const uchar * key,
{ {
int error; int error;
/* Use the pushed index condition if it matches the index we're scanning */ /* Use the pushed index condition if it matches the index we're scanning */
end_range= NULL;
if (index == pushed_idx_cond_keyno) if (index == pushed_idx_cond_keyno)
ma_set_index_cond_func(file, index_cond_func_maria, this); ma_set_index_cond_func(file, index_cond_func_maria, this);
......
...@@ -1792,6 +1792,7 @@ int ha_myisam::index_read_idx_map(uchar *buf, uint index, const uchar *key, ...@@ -1792,6 +1792,7 @@ int ha_myisam::index_read_idx_map(uchar *buf, uint index, const uchar *key,
{ {
int res; int res;
/* Use the pushed index condition if it matches the index we're scanning */ /* Use the pushed index condition if it matches the index we're scanning */
end_range= NULL;
if (index == pushed_idx_cond_keyno) if (index == pushed_idx_cond_keyno)
mi_set_index_cond_func(file, index_cond_func_myisam, this); mi_set_index_cond_func(file, index_cond_func_myisam, this);
res= mi_rkey(file, buf, index, key, keypart_map, find_flag); res= mi_rkey(file, buf, index, key, keypart_map, find_flag);
......
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