diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-01-17 13:09:04 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-09-04 16:45:02 +0200 |
| commit | 17589989eec9cf4e9f7084505710a42929efe115 (patch) | |
| tree | 8b4d2564d65bdc7656ec741aa7b6b5237d2b5387 /sql/sp_head.h | |
| parent | be45f083e6e7d8da6dbf2349d9c59673d7e61139 (diff) | |
| download | mariadb-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_head.h')
| -rw-r--r-- | sql/sp_head.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 604190079cb..5d3697daa16 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -232,6 +232,7 @@ private: */ uint32 unsafe_flags; + uint m_select_number; public: inline Stored_program_creation_ctx *get_creation_ctx() { @@ -521,6 +522,8 @@ public: sp_pcontext *get_parse_context() { return m_pcont; } + void set_select_number(uint num) { m_select_number= num; } + private: MEM_ROOT *m_thd_root; ///< Temp. store for thd's mem_root |