diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-05 17:08:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-05 17:08:44 +0300 |
| commit | b4c377f21510849a67bcb0c72e8715903883ce4d (patch) | |
| tree | 2eae0cae1fbf06a07d1e30b0c2c34ffc11d4df3b /sql/sp_head.cc | |
| parent | 1748a31ae8d69e4939336f644f884e9de3039e7f (diff) | |
| parent | 1b335a74b4ea1944d6ef91113b1a510c0f11c557 (diff) | |
| download | mariadb-git-b4c377f21510849a67bcb0c72e8715903883ce4d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index c2d42cd830f..c1c938dd9e7 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -27,6 +27,7 @@ #include "sql_array.h" // Dynamic_array #include "log_event.h" // Query_log_event #include "sql_derived.h" // mysql_handle_derived +#include "sql_cte.h" #include "sql_select.h" // Virtual_tmp_table #ifdef USE_PRAGMA_IMPLEMENTATION @@ -3313,7 +3314,8 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, #endif if (open_tables) - res= instr->exec_open_and_lock_tables(thd, m_lex->query_tables); + res= check_dependencies_in_with_clauses(m_lex->with_clauses_list) || + instr->exec_open_and_lock_tables(thd, m_lex->query_tables); if (likely(!res)) { |