diff options
| author | unknown <evgen@moonbone.local> | 2006-01-16 16:57:15 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-01-16 16:57:15 +0300 |
| commit | 9422fee7de29504c9b1bbd02e49173e3a130a9b3 (patch) | |
| tree | cb6f888f350fe4c923d070ac254cf224753512ea /sql/sql_handler.cc | |
| parent | 99ebd49555bd1993ccb3745eb3b55f4ea38ec49d (diff) | |
| parent | 85f2158b95520b3833732e18ead9c74856b05ff6 (diff) | |
| download | mariadb-git-9422fee7de29504c9b1bbd02e49173e3a130a9b3.tar.gz | |
Manually merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/myisam_ftdump.c:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index f1bbf6f0f5e..78eacd02e56 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -424,7 +424,11 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, if (cond && ((!cond->fixed && cond->fix_fields(thd, &cond)) || cond->check_cols(1))) + { + if (table->query_id != thd->query_id) + cond->cleanup(); // File was reopened goto err0; + } if (keyname) { |