summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-10-07 14:13:42 +0300
committerunknown <bell@sanja.is.com.ua>2004-10-07 14:13:42 +0300
commitd7395d613e2d2d61f75b9d88b1eeb9e8356ed5cb (patch)
tree961ae70e93cac066f0848d6d99c7f4ed6fb36e1b /sql
parent5b3444d2faf45786e5f6078e442e0514c8b2814e (diff)
downloadmariadb-git-d7395d613e2d2d61f75b9d88b1eeb9e8356ed5cb.tar.gz
correct (high level) fix for BUG#5367 to privent problems in other engines
Diffstat (limited to 'sql')
-rw-r--r--sql/item_subselect.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index bb2bb6319a9..5acf8242c65 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1287,7 +1287,8 @@ int subselect_uniquesubquery_engine::exec()
error= table->file->index_read(table->record[0],
tab->ref.key_buff,
tab->ref.key_length,HA_READ_KEY_EXACT);
- if (error && error != HA_ERR_KEY_NOT_FOUND)
+ if (error &&
+ error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
error= report_error(table, error);
else
{
@@ -1339,7 +1340,8 @@ int subselect_indexsubquery_engine::exec()
error= table->file->index_read(table->record[0],
tab->ref.key_buff,
tab->ref.key_length,HA_READ_KEY_EXACT);
- if (error && error != HA_ERR_KEY_NOT_FOUND)
+ if (error &&
+ error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
error= report_error(table, error);
else
{