diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-02-17 12:54:51 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2015-03-12 10:19:32 +0100 |
| commit | a71e2d23bd08ca041a953df44f2235a8ef20bfcc (patch) | |
| tree | 97600c27c01b16da1c009b30160654b07cf0388b /sql/sql_cursor.cc | |
| parent | dab12366b1c7ee4e3477ac9dd37ea6c24113cf5b (diff) | |
| download | mariadb-git-a71e2d23bd08ca041a953df44f2235a8ef20bfcc.tar.gz | |
MDEV-7006 MDEV-7007: SET STATEMENT and slow log
fixed embedded server tests
MDEV-7009: SET STATEMENT min_examined_row_limit has no effect
MDEV-6948:SET STATEMENT gtid_domain_id = ... FOR has no effect (same for gtid_seq_no and server_id)
old values of SET STATENENT variables now saved in its own Query_arena and restored later
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 99b7b1e58d0..a7dcc77f26c 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -122,6 +122,7 @@ int mysql_open_cursor(THD *thd, select_result *result, /* Mark that we can't use query cache with cursors */ thd->query_cache_is_applicable= 0; rc= mysql_execute_command(thd); + thd->lex->restore_set_statement_var(); thd->m_statement_psi= parent_locker; MYSQL_QUERY_EXEC_DONE(rc); |