Fixed a bug in merge.

0f4962c3 · unknown · 5c28e9c8 · 0f4962c3
Commit 0f4962c3 authored Jan 12, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

sql/sql_handler.cc sql/sql_handler.cc +1 -3

No files found.
--- 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 &&
+    goto err0;
-	 cond->fix_fields(thd, tables, &cond)) || cond->check_cols(1))
-      goto err0;
  }
  if (keyname)