diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
| commit | 860e754349646fb8ec8e9231a7fc09a5d4b7c247 (patch) | |
| tree | d66c4b8a3c96e8e0d6e6ad9dfb12cdca750eb754 /sql/sp_head.cc | |
| parent | 71e1ddda220c2d452351fc6bf240cb0bad6ccf4a (diff) | |
| parent | 365cd08345ab759308cfcac663a2a5880c0c33cb (diff) | |
| download | mariadb-git-860e754349646fb8ec8e9231a7fc09a5d4b7c247.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 0812d61ced8..d1cf5c2d9bd 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -3492,8 +3492,7 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, Json_writer_object trace_command(thd); Json_writer_array trace_command_steps(thd, "steps"); if (open_tables) - res= check_dependencies_in_with_clauses(m_lex->with_clauses_list) || - instr->exec_open_and_lock_tables(thd, m_lex->query_tables); + res= instr->exec_open_and_lock_tables(thd, m_lex->query_tables); if (likely(!res)) { |