diff options
| author | Monty <monty@mariadb.org> | 2015-08-18 11:27:00 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-08-18 11:27:00 +0300 |
| commit | 4374da63f03abc472f68f42e4e93261a18bfe417 (patch) | |
| tree | 4e6ee59be4da4839e8915532b26c0144138e156a /sql/sp_head.cc | |
| parent | 5fe8b747e9e3440f2f746accca0eb11e287a6713 (diff) | |
| parent | dfac82e44dd665ab218348765df2b519db4c10dc (diff) | |
| download | mariadb-git-4374da63f03abc472f68f42e4e93261a18bfe417.tar.gz | |
Merge /my/maria-10.1-default into 10.1
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 777775e6e39..667cac41d43 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1133,6 +1133,8 @@ sp_head::execute(THD *thd, bool merge_da_on_success) Diagnostics_area *da= thd->get_stmt_da(); Warning_info sp_wi(da->warning_info_id(), false, true); + UNINIT_VAR(saved_creation_ctx); + /* this 7*STACK_MIN_SIZE is a complex matter with a long history (see it!) */ if (check_stack_overrun(thd, 7 * STACK_MIN_SIZE, (uchar*)&old_packet)) DBUG_RETURN(TRUE); |