diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
| commit | 9b4a179d69a1c795bef303a88f9d3195669f00ec (patch) | |
| tree | 87811d81af231e2945468ead0cba58cfc5514548 /sql/sql_lex.cc | |
| parent | 020dc54dabe64f238e8ef4f50a630a22e0f06949 (diff) | |
| parent | 7db489fc7dea2b4c236807035e57f169074c6682 (diff) | |
| download | mariadb-git-10.3-merge.tar.gz | |
Merge branch '10.2' into bb-10.3-release10.3-merge
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b2ce5adaed6..88a9da96998 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -5062,18 +5062,19 @@ void LEX::free_arena_for_set_stmt() DBUG_VOID_RETURN; } -void LEX::restore_set_statement_var() +bool LEX::restore_set_statement_var() { + bool err= false; DBUG_ENTER("LEX::restore_set_statement_var"); if (!old_var_list.is_empty()) { DBUG_PRINT("info", ("vars: %d", old_var_list.elements)); - sql_set_variables(thd, &old_var_list, false); + err= sql_set_variables(thd, &old_var_list, false); old_var_list.empty(); free_arena_for_set_stmt(); } DBUG_ASSERT(!is_arena_for_set_stmt()); - DBUG_VOID_RETURN; + DBUG_RETURN(err); } unit_common_op st_select_lex_unit::common_op() |