diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2014-10-22 19:47:05 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2014-10-22 19:58:50 +0200 |
| commit | af93dc48cffdc9a071e3ec6e1fe51f1d7d06686b (patch) | |
| tree | 938d7fa8cbefa67161d50172ff962a842904d71c /sql/sql_lex.cc | |
| parent | c3db4459561bc491582bef6bea7b83e9fe464a10 (diff) | |
| download | mariadb-git-bb-set-statement.tar.gz | |
MDEV-5231: Per query variables from Percona Server (rewritten)bb-set-statement
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 7eb38b1dd7a..6432e1937be 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -542,6 +542,8 @@ void lex_start(THD *thd) lex->reset_slave_info.all= false; lex->limit_rows_examined= 0; lex->limit_rows_examined_cnt= ULONGLONG_MAX; + lex->var_list.empty(); + lex->stmt_var_list.empty(); DBUG_VOID_RETURN; } @@ -4233,6 +4235,17 @@ int LEX::print_explain(select_result_sink *output, uint8 explain_flags, return res; } +void LEX::restore_set_statement_var() +{ + 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); + old_var_list.empty(); + } + DBUG_VOID_RETURN; +} /* Save explain structures of a UNION. The only variable member is whether the |