mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
Merge with 5.1
This commit is contained in:
commit
d52a41d26a
1 changed files with 2 additions and 2 deletions
|
@ -4523,11 +4523,11 @@ int handler::index_read_idx_map(uchar * buf, uint index, const uchar * key,
|
||||||
int error, error1;
|
int error, error1;
|
||||||
LINT_INIT(error1);
|
LINT_INIT(error1);
|
||||||
|
|
||||||
error= index_init(index, 0);
|
error= ha_index_init(index, 0);
|
||||||
if (!error)
|
if (!error)
|
||||||
{
|
{
|
||||||
error= index_read_map(buf, key, keypart_map, find_flag);
|
error= index_read_map(buf, key, keypart_map, find_flag);
|
||||||
error1= index_end();
|
error1= ha_index_end();
|
||||||
}
|
}
|
||||||
return error ? error : error1;
|
return error ? error : error1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue