bk commit into 5.0 tree (gkodinov:1.2482)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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-07-23 06:26:57+03:00, gkodinov@stripped +2 -0
  table.cc, sql_select.cc:
    Limit the fix for bug 28591 to InnoDB only

  sql/sql_select.cc@stripped, 2007-07-23 06:25:59+03:00, gkodinov@stripped +1 -0
    Limit the fix for bug 28591 to InnoDB only

  sql/table.cc@stripped, 2007-07-23 06:26:30+03:00, gkodinov@stripped +2 -1
    Limit the fix for bug 28591 to InnoDB only

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-07-22 19:21:51 +03:00
+++ b/sql/sql_select.cc	2007-07-23 06:25:59 +03:00
@@ -12033,6 +12033,7 @@ static int test_if_order_by_key(ORDER *o
       */
       if (!on_primary_key &&
           (table->file->table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX)
&&
+          table->s->db_type == DB_TYPE_INNODB &&
           table->s->primary_key != MAX_KEY)
       {
         on_primary_key= TRUE;
diff -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2007-07-22 19:21:51 +03:00
+++ b/sql/table.cc	2007-07-23 06:26:30 +03:00
@@ -782,7 +782,8 @@ int openfrm(THD *thd, const char *name, 
 	    if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
             {
 	      field->part_of_key= share->keys_in_use;
-              if (field->part_of_sortkey.is_set(key))
+              if (share->db_type == DB_TYPE_INNODB && 
+                  field->part_of_sortkey.is_set(key))
                 field->part_of_sortkey= share->keys_in_use;
             }
 	  }