summaryrefslogtreecommitdiff
path: root/sql/sp.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2017-01-17 13:09:04 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2017-09-04 16:45:02 +0200
commit17589989eec9cf4e9f7084505710a42929efe115 (patch)
tree8b4d2564d65bdc7656ec741aa7b6b5237d2b5387 /sql/sp.cc
parentbe45f083e6e7d8da6dbf2349d9c59673d7e61139 (diff)
downloadmariadb-git-17589989eec9cf4e9f7084505710a42929efe115.tar.gz
MDEV-10972: Insert from select / view / union -- repeatable crash in 10.1, 10.2 Linux/Mac/Windows
save thd->select_number between parsing and executions (in case it was not complete executed due to errors (for example epsent table))
Diffstat (limited to 'sql/sp.cc')
-rw-r--r--sql/sp.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index 2e268e483e7..5a64c28865e 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -760,6 +760,7 @@ static sp_head *sp_compile(THD *thd, String *defstr, ulonglong sql_mode,
else
{
sp= thd->lex->sphead;
+ sp->set_select_number(thd->select_number);
}
thd->pop_internal_handler();