From 5caff162f969b7fcbdf4461ff065e7049ffac72c Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Mon, 15 Mar 2004 22:02:47 +0100
Subject: [PATCH] cleanup

---
 sql/sql_select.cc |  3 +--
 sql/sql_table.cc  | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 7605016dbe1..467c1295517 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -842,8 +842,7 @@ JOIN::optimize()
     for (uint i_h = const_tables; i_h < tables; i_h++)
     {
       TABLE* table_h = join_tab[i_h].table;
-      if (table_h->db_type == DB_TYPE_INNODB)
-	table_h->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+      table_h->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
     }
   }
 #endif
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 9d1855ef936..02dc5ba013e 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2979,12 +2979,10 @@ int mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt)
         /* calculating table's checksum */
         ha_checksum crc= 0;
 
-	if (t->db_type == DB_TYPE_INNODB) {
-	  /* InnoDB must be told explicitly to retrieve all columns, because
-	  this function does not set field->query_id in the columns to the
-	  current query id */
-	  t->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
-	}
+        /* InnoDB must be told explicitly to retrieve all columns, because
+        this function does not set field->query_id in the columns to the
+        current query id */
+        t->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
 
         if (t->file->rnd_init(1))
           protocol->store_null();