bk commit into 5.1 tree (igor:1.2590)

[igor]

Below is the list of changes that have just been committed into a local
5.1 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, 2007-08-03 21:10:57-07:00, igor@stripped +1 -0
  Fixed a memory leak in the patch for bug 28404.

  sql/sql_select.cc@stripped, 2007-08-03 21:10:44-07:00, igor@stripped +5 -2
    Fixed a memory leak in the patch for bug 28404.

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-08-03 08:45:44 -07:00
+++ b/sql/sql_select.cc	2007-08-03 21:10:44 -07:00
@@ -12911,8 +12911,11 @@ test_if_skip_sort_order(JOIN_TAB *tab,OR
           {
             tab->ref.key= -1;
             tab->ref.key_parts= 0;
-            if (tab->select)
-              tab->select->quick= 0;
+            if (select && select->quick)
+            {
+              delete select->quick;
+              select->quick= 0;
+            }
             if (select_limit < table_records) 
               tab->limit= select_limit;
           }