diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
| commit | 60589aeee03949033c66da5c1eae70d4342179fc (patch) | |
| tree | 1cd399dbed17c5c7b4ed16eb7b872dc979af1c93 /sql/sql_prepare.cc | |
| parent | b39e6e3d093b45f792959ef06fea1c175263ae1a (diff) | |
| download | mariadb-git-60589aeee03949033c66da5c1eae70d4342179fc.tar.gz | |
Next part of merge. See TODO for details
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index ed437c498e6..b579474ee4d 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3072,6 +3072,7 @@ Execute_sql_statement(LEX_STRING sql_text) bool Execute_sql_statement::execute_server_code(THD *thd) { + PSI_statement_locker *parent_locker; bool error; if (alloc_query(thd, m_sql_text.str, m_sql_text.length)) @@ -3091,7 +3092,10 @@ Execute_sql_statement::execute_server_code(THD *thd) thd->lex->set_trg_event_type_for_tables(); + parent_locker= thd->m_statement_psi; + thd->m_statement_psi= NULL; error= mysql_execute_command(thd); + thd->m_statement_psi= parent_locker; /* report error issued during command execution */ if (error == 0 && thd->spcont == NULL) @@ -3877,13 +3881,17 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) if (query_cache_send_result_to_client(thd, thd->query(), thd->query_length()) <= 0) { + PSI_statement_locker *parent_locker; MYSQL_QUERY_EXEC_START(thd->query(), thd->thread_id, (char *) (thd->db ? thd->db : ""), &thd->security_ctx->priv_user[0], (char *) thd->security_ctx->host_or_ip, 1); + parent_locker= thd->m_statement_psi; + thd->m_statement_psi= NULL; error= mysql_execute_command(thd); + thd->m_statement_psi= parent_locker; MYSQL_QUERY_EXEC_DONE(error); } } |