bk commit into 5.2 tree (kaa:1.2618) BUG#31207

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.2 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-18 15:34:46+04:00, kaa@polly.(none) +1 -0
  Post-merge fixes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/handler.cc@stripped, 2007-10-18 15:34:38+04:00, kaa@polly.(none) +2 -2
    Post-merge fixes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc	2007-09-28 00:36:56 +04:00
+++ b/sql/handler.cc	2007-10-18 15:34:38 +04:00
@@ -3613,8 +3613,8 @@ int DsMrr_impl::dsmrr_fill_buffer(handle
   uint elem_size= h->ref_length + (int)is_mrr_assoc * sizeof(void*);
   uint n_rowids= (rowids_buf_cur - rowids_buf) / elem_size;
   
-  qsort2(rowids_buf, n_rowids, elem_size, (qsort2_cmp)rowid_cmp,
-         (void*)h);
+  my_qsort2(rowids_buf, n_rowids, elem_size, (qsort2_cmp)rowid_cmp,
+            (void*)h);
   rowids_buf_last= rowids_buf_cur;
   rowids_buf_cur=  rowids_buf;
   DBUG_RETURN(0);