diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:49:47 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:49:47 +0200 |
| commit | 0f4962c338716bbc72ba8dd7102052fcbcfd4f80 (patch) | |
| tree | 14aca95dcad51344e4d234d2cd4eb7605b61778a /sql/sql_handler.cc | |
| parent | 5c28e9c8d0f79931e39c9ad1eb51434328e702cd (diff) | |
| download | mariadb-git-0f4962c338716bbc72ba8dd7102052fcbcfd4f80.tar.gz | |
Fixed a bug in merge.
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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) |