diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
| commit | 70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f (patch) | |
| tree | 5eea378d9752f55471ea2bc35f83ad5675471485 /sql/sp.cc | |
| parent | c59a52b7bad473a162a51000f2a24507c83b5fc8 (diff) | |
| parent | 7008d4616421fdf73d109ed297def27fa4679da4 (diff) | |
| download | mariadb-git-70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 383eef9f5ce..a31b2a2cfc5 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -760,6 +760,7 @@ static sp_head *sp_compile(THD *thd, String *defstr, sql_mode_t sql_mode, else { sp= thd->lex->sphead; + sp->set_select_number(thd->select_number); } thd->pop_internal_handler(); |