From f129754096ff75d32a7f84872f9d65a819e8445b Mon Sep 17 00:00:00 2001
From: "gshchepa/uchum@gleb.loc" <>
Date: Thu, 26 Jul 2007 04:08:58 +0500
Subject: [PATCH] sql_select.cc:   Post-merge fix.

---
 sql/sql_select.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b1954620800..0973971de1c 100644
--- 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->s->db_type == DB_TYPE_INNODB &&
+          (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
+          table->s->db_type()->db_type == DB_TYPE_INNODB &&
           table->s->primary_key != MAX_KEY)
       {
         on_primary_key= TRUE;