Merge with 5.1

d52a41d2 · Michael Widenius · 108e9ee8 · 3c0a37fd · d52a41d2
Commit d52a41d2 authored Jan 14, 2011 by Michael Widenius
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/handler.cc sql/handler.cc +2 -2

No files found.
--- 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;
 }