Commit 0f4962c3 authored by unknown's avatar unknown

Fixed a bug in merge.

parent 5c28e9c8
...@@ -426,8 +426,6 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, ...@@ -426,8 +426,6 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables,
{ {
if (table->query_id != thd->query_id) if (table->query_id != thd->query_id)
cond->cleanup(); // File was reopened cond->cleanup(); // File was reopened
if ((!cond->fixed &&
cond->fix_fields(thd, tables, &cond)) || cond->check_cols(1))
goto err0; goto err0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment