bk commit into 6.0 tree (igor:1.2633)

[igor]

Below is the list of changes that have just been committed into a local
6.0 repository of igor.  When igor 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-06-11 08:57:58-07:00, igor@stripped +1 -0
  Fixed a bug in JOIN_CACHE_BKA_UNIQUE::rem_space that could cause
  a curruption of the hash table in the join buffer.
   

  sql/sql_select.h@stripped, 2008-06-11 08:57:53-07:00, igor@stripped +1 -1
    Fixed a bug in JOIN_CACHE_BKA_UNIQUE::rem_space that could cause
    a curruption of the hash table in the join buffer.
     

diff -Nrup a/sql/sql_select.h b/sql/sql_select.h
--- a/sql/sql_select.h	2008-06-06 19:33:42 -07:00
+++ b/sql/sql_select.h	2008-06-11 08:57:53 -07:00
@@ -1073,7 +1073,7 @@ protected:
   */ 
   ulong rem_space() 
   { 
-    return max((buff+buff_size-last_key_entry)-(end_pos-buff)-aux_buff_size,0);
+    return max(last_key_entry-end_pos-aux_buff_size,0);
   }
 
   /*