diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
| commit | 00d1db7a38b17d4512a6ba5147926608aca5624d (patch) | |
| tree | c2b28145304e9eacf79fcabaeb962a20d79fec93 /sql/item_subselect.cc | |
| parent | 0485328d030f4b742dac7b667e8ed099beb9e9f2 (diff) | |
| parent | 0251232f8c3bca33b4dd15d6668105f3de9d024d (diff) | |
| download | mariadb-git-00d1db7a38b17d4512a6ba5147926608aca5624d.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 6444f672176..f22716d3d81 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -5329,6 +5329,7 @@ int subselect_hash_sj_engine::exec() item_in->reset(); item_in->make_const(); item_in->set_first_execution(); + thd->lex->current_select= save_select; DBUG_RETURN(FALSE); } @@ -5372,6 +5373,7 @@ int subselect_hash_sj_engine::exec() item_in->null_value= 1; item_in->make_const(); item_in->set_first_execution(); + thd->lex->current_select= save_select; DBUG_RETURN(FALSE); } |