bk commit into 5.1 tree (gshchepa:1.2558)

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.1 repository of uchum. When uchum 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-26 04:41:48+05:00, gshchepa@stripped +2 -0
  table.cc, sql_select.cc:
    Post-merge fix.

  sql/sql_select.cc@stripped, 2007-07-26 04:41:01+05:00, gshchepa@stripped +1 -1
    Post-merge fix.

  sql/table.cc@stripped, 2007-07-26 04:41:16+05:00, gshchepa@stripped +1 -1
    Post-merge fix.

diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-07-26 04:05:41 +05:00
+++ b/sql/sql_select.cc	2007-07-26 04:41:01 +05:00
@@ -12313,7 +12313,7 @@ static int test_if_order_by_key(ORDER *o
       */
       if (!on_primary_key &&
           (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
-          table->s->db_type()->db_type == DB_TYPE_INNODB &&
+          ha_legacy_type(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-26 01:23:37 +05:00
+++ b/sql/table.cc	2007-07-26 04:41:16 +05:00
@@ -1351,7 +1351,7 @@ static int open_binary_frm(THD *thd, TAB
           if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
           {
             field->part_of_key= share->keys_in_use;
-            if (share->db_type == DB_TYPE_INNODB && 
+            if (ha_legacy_type(share->db_type()) == DB_TYPE_INNODB &&
                 field->part_of_sortkey.is_set(key))
               field->part_of_sortkey= share->keys_in_use;
           }