diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:28:23 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:28:23 +0200 |
| commit | a48380cd9a29a67cb161ffc0a9b7a037efe04297 (patch) | |
| tree | 986db555a436ebf570733597877d21e2ffa95d36 /sql/sql_handler.cc | |
| parent | 26252fa28bfa0c2dcf7d7b47cba51f47b30b2eb7 (diff) | |
| parent | 1665d2370716a44acf7d35339019ad5b9e134b99 (diff) | |
| download | mariadb-git-a48380cd9a29a67cb161ffc0a9b7a037efe04297.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
client/mysqlimport.c:
Auto merged
include/config-netware.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
netware/mysqld_safe.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Merged from 4.1.
sql/sql_base.cc:
Merged from 4.1.
sql/sql_handler.cc:
Merged from 4.1.
sql/sql_select.cc:
Merged from 4.1.
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index fae48c7d164..3370a0a1957 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -423,7 +423,13 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, if (cond && ((!cond->fixed && cond->fix_fields(thd, &cond)) || cond->check_cols(1))) - goto err0; + { + 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; + } if (keyname) { |