diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-14 16:49:27 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-14 16:49:27 +0200 |
| commit | d52a41d26aedf5f27d75588b2c417c2ccaaf10d0 (patch) | |
| tree | 68b80f1655131172022eba9f216b1f3b10fd0922 /sql/handler.cc | |
| parent | 108e9ee84ead6a8665c7faca7c63aa168414a8d9 (diff) | |
| parent | 3c0a37fd1873532a19a8f57bbd7e81792aa8142f (diff) | |
| download | mariadb-git-d52a41d26aedf5f27d75588b2c417c2ccaaf10d0.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index e1808e8d460..0e00832d89b 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -4523,11 +4523,11 @@ int handler::index_read_idx_map(uchar * buf, uint index, const uchar * key, int error, error1; LINT_INIT(error1); - error= index_init(index, 0); + error= ha_index_init(index, 0); if (!error) { error= index_read_map(buf, key, keypart_map, find_flag); - error1= index_end(); + error1= ha_index_end(); } return error ? error : error1; } |