From 3cfda33b04b1c8af4efc17001f3eaa4f16f93e1c Mon Sep 17 00:00:00 2001
From: unknown <jani@ua141d10.elisa.omakaista.fi>
Date: Thu, 12 Jan 2006 20:49:47 +0200
Subject: Fixed a bug in merge.

---
 sql/sql_handler.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sql/sql_handler.cc')

diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 3370a0a1957..e9e1e79daaf 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -426,9 +426,7 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables,
   {
     if (table->query_id != thd->query_id)
       cond->cleanup();                          // File was reopened
-    if ((!cond->fixed &&
-	 cond->fix_fields(thd, tables, &cond)) || cond->check_cols(1))
-      goto err0;
+    goto err0;
   }
 
   if (keyname)
-- 
cgit v1.2.1