sql_select.cc:

Post-merge fix.

sql_select.cc:
Post-merge fix.
f1297540 · gshchepa/uchum@gleb.loc · 3595bbb3 · f1297540
Commit f1297540 authored Jul 26, 2007 by gshchepa/uchum@gleb.loc
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_select.cc sql/sql_select.cc +2 -2

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12312,8 +12312,8 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
        the primary key as a suffix.
      */
      if (!on_primary_key &&
-          (table->file->table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
+          (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
-          table->s->db_type == DB_TYPE_INNODB &&
+          table->s->db_type()->db_type == DB_TYPE_INNODB &&
          table->s->primary_key != MAX_KEY)
      {
        on_primary_key= TRUE;