[Commits] Rev 2913: Merge with 5.1 in lp:maria/5.2

Michael Widenius monty at askmonty.org
Fri Jan 14 16:49:35 EET 2011


At lp:maria/5.2

------------------------------------------------------------
revno: 2913 [merge]
revision-id: monty at askmonty.org-20110114144927-7zkle63tlxtybnla
parent: knielsen at knielsen-hq.org-20110113122836-3c70xnbx4i5y20vz
parent: monty at askmonty.org-20110114144514-qb0opxk80c576j3k
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.2
timestamp: Fri 2011-01-14 16:49:27 +0200
message:
  Merge with 5.1
modified:
  sql/handler.cc                 sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
-------------- next part --------------
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2011-01-10 21:42:47 +0000
+++ b/sql/handler.cc	2011-01-14 14:49:27 +0000
@@ -4523,11 +4523,11 @@ int handler::index_read_idx_map(uchar *
   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;
 }



More information about the commits mailing list