bk commit into 5.0 tree (tsmith:1.2570) BUG#32149

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith.  When tsmith 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, 2008-01-30 19:00:20-07:00, tsmith@stripped +1 -0
  Bug #32149  Long semaphore wait for adaptive hash latch
  
  Fix by calling ha_release_temporary_latches() before ::filesort().

  sql/filesort.cc@stripped, 2008-01-30 19:00:19-07:00, tsmith@stripped +7 -0
    Call ha_release_temporary_latches() before performing
    a (possibly long) ::filesort().

diff -Nrup a/sql/filesort.cc b/sql/filesort.cc
--- a/sql/filesort.cc	2008-01-10 08:52:24 -07:00
+++ b/sql/filesort.cc	2008-01-30 19:00:19 -07:00
@@ -112,6 +112,13 @@ ha_rows filesort(THD *thd, TABLE *table,
   FILESORT_INFO table_sort;
   TABLE_LIST *tab= table->pos_in_table_list;
   Item_subselect *subselect= tab ? tab->containing_subselect() : 0;
+
+  /*
+   Release InnoDB's adaptive hash index latch (if holding) before
+   running a sort.
+  */
+  ha_release_temporary_latches(thd);
+
   /* 
     Don't use table->sort in filesort as it is also used by 
     QUICK_INDEX_MERGE_SELECT. Work with a copy and put it back at the end