database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

MDEV-7006 MDEV-7007: SET STATEMENT and slow log

Browse Source 
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
This commit is contained in:
Oleksandr Byelkin
2015-02-17 12:54:51 +01:00
parent dab12366b1
commit a71e2d23bd
14 changed files with 314 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_prepare.cc
View File

@ -2775,7 +2775,7 @@ void mysql_sql_stmt_execute(THD *thd)
DBUG_PRINT("info",("stmt: 0x%lx", (long) stmt));
(void) stmt->execute_loop(&expanded_query, FALSE, NULL, NULL);
stmt->lex->restore_set_statement_var();
DBUG_VOID_RETURN;
}
@ -3165,6 +3165,7 @@ Execute_sql_statement::execute_server_code(THD *thd)
thd->query(), thd->query_length());
end:
thd->lex->restore_set_statement_var();
lex_end(thd->lex);
return error;
@ -4085,6 +4086,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
general_log_write(thd, COM_STMT_EXECUTE, thd->query(), thd->query_length());
error:
thd->lex->restore_set_statement_var();
flags&= ~ (uint) IS_IN_USE;
return error;
}