mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
perfschema 5.6.24
including the big commit commit 305130361bf72726de220f3d2b2787395e10be61 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Feb 10 11:31:32 2015 +0100 WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6 (with the following commits) and related changes in sql/
This commit is contained in:
@@ -98,6 +98,7 @@ public:
|
||||
int mysql_open_cursor(THD *thd, select_result *result,
|
||||
Server_side_cursor **pcursor)
|
||||
{
|
||||
sql_digest_state *parent_digest;
|
||||
PSI_statement_locker *parent_locker;
|
||||
select_result *save_result;
|
||||
Select_materialize *result_materialize;
|
||||
@@ -117,11 +118,14 @@ int mysql_open_cursor(THD *thd, select_result *result,
|
||||
&thd->security_ctx->priv_user[0],
|
||||
(char *) thd->security_ctx->host_or_ip,
|
||||
2);
|
||||
parent_digest= thd->m_digest;
|
||||
parent_locker= thd->m_statement_psi;
|
||||
thd->m_digest= NULL;
|
||||
thd->m_statement_psi= NULL;
|
||||
/* Mark that we can't use query cache with cursors */
|
||||
thd->query_cache_is_applicable= 0;
|
||||
rc= mysql_execute_command(thd);
|
||||
thd->m_digest= parent_digest;
|
||||
thd->m_statement_psi= parent_locker;
|
||||
MYSQL_QUERY_EXEC_DONE(rc);
|
||||
|
||||
|
Reference in New Issue
Block a user