summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-07-16 15:57:27 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-07-16 15:57:27 +0400
commit947c2bdbc07e13d064497a155fa469e2c84c306c (patch)
tree61359b8bce20a4ae4556e7b9f4ce646ba7387bec /sql/sql_select.cc
parent47c1b0407971408eefaabee79a1097fd5c6ea90f (diff)
downloadmariadb-git-947c2bdbc07e13d064497a155fa469e2c84c306c.tar.gz
MDEV-4782: Valgrind warnings (Conditional jump or move depends on uninitialised value) with InnoDB, semijoin
- in sub_select(): don't call table->file->position() when reading the first record produced an error.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index f1b08806411..e517c05c161 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -16326,7 +16326,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
if (rc != NESTED_LOOP_NO_MORE_ROWS)
{
error= (*join_tab->read_first_record)(join_tab);
- if (join_tab->keep_current_rowid)
+ if (!error && join_tab->keep_current_rowid)
join_tab->table->file->position(join_tab->table->record[0]);
rc= evaluate_join_record(join, join_tab, error);
}