mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Valgrind fix for the previous cset:

Browse source 
- {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.
This commit is contained in:
Sergey Petrunya 2011-07-15 03:29:38 +04:00
parent 932d516656
commit 08fa757a73
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
storage/maria/ha_maria.cc
View file

@ -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);

1
storage/myisam/ha_myisam.cc
View file

@ -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);