diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-26 16:59:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-27 11:38:38 +0100 |
| commit | a0ea3a5822486fa1702d6615f1be30684c3d412f (patch) | |
| tree | 46726c30bd080cba0152ebd18711e90c740fb70e /sql/sql_lex.cc | |
| parent | 524221e7a34d42214e82dd868348b453f2ef1591 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-14857.tar.gz | |
MDEV-14857: problem with 10.2.11 server crashing when executing stored procedurebb-10.1-MDEV-14857
Counter for select numbering made stored with the statement (before was global)
So now it does have always accurate value which does not depend on
interruption of statement prepare by errors like lack of table in
a view definition.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 63ab6b5d046..5b8327d6f59 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -657,6 +657,7 @@ void lex_start(THD *thd) { LEX *lex= thd->lex; DBUG_ENTER("lex_start"); + DBUG_PRINT("info", ("Lex %p stmt_lex: %p", thd->lex, thd->stmt_lex)); lex->thd= lex->unit.thd= thd; @@ -668,6 +669,7 @@ void lex_start(THD *thd) /* 'parent_lex' is used in init_query() so it must be before it. */ lex->select_lex.parent_lex= lex; lex->select_lex.init_query(); + lex->current_select_number= 1; lex->value_list.empty(); lex->update_list.empty(); lex->set_var_list.empty(); |