diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-01-16 23:15:00 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2006-01-16 23:15:00 +0200 |
| commit | 2337181f132d2f4a3e1ae68cd66722d6638b1a50 (patch) | |
| tree | ccf00be205dfdfd6f8921590dfe2f9c6a12fce39 /sql/sql_handler.cc | |
| parent | 93fb06520f20a4e4e7d694de65f984beca880bef (diff) | |
| download | mariadb-git-2337181f132d2f4a3e1ae68cd66722d6638b1a50.tar.gz | |
Changed condition similar to code in 4.1.
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index e9e1e79daaf..1cd7778a053 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -421,12 +421,13 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, if (!lock) goto err0; // mysql_lock_tables() printed error message already - if (cond && ((!cond->fixed && - cond->fix_fields(thd, &cond)) || cond->check_cols(1))) + if (cond) { if (table->query_id != thd->query_id) cond->cleanup(); // File was reopened - goto err0; + if ((!cond->fixed && + cond->fix_fields(thd, &cond)) || cond->check_cols(1)) + goto err0; } if (keyname) |