diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-06-06 16:13:51 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2015-06-06 16:13:51 +0200 |
| commit | 6264451f25143c43e1ad8e045054b720effaf8cb (patch) | |
| tree | ab0f44608429ecf9714ed3abf04c4d7574c6bd61 /sql/sql_lex.h | |
| parent | 9a3b975da677e77d63f72f0e6bf0450161b4672d (diff) | |
| download | mariadb-git-6264451f25143c43e1ad8e045054b720effaf8cb.tar.gz | |
MDEV-8114: server crash on updates with joins still on 10.0.18
Check that leaf table list is really built before storing it.
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 69ee5cc9be0..a0f8e456800 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -789,7 +789,8 @@ public: List<TABLE_LIST> leaf_tables; List<TABLE_LIST> leaf_tables_exec; List<TABLE_LIST> leaf_tables_prep; - bool is_prep_leaf_list_saved; + enum leaf_list_state {UNINIT, READY, SAVED}; + enum leaf_list_state prep_leaf_list_state; uint insert_tables; st_select_lex *merged_into; /* select which this select is merged into */ /* (not 0 only for views/derived tables) */ |