diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 17:40:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 17:40:53 +0100 |
| commit | febe1e850342ea52ce0900ba5767852b0aa42dc7 (patch) | |
| tree | af188bde7aff4951c9f845a5c22912222b6ca888 /sql/sql_prepare.cc | |
| parent | d3681c18f96ebf9b66c7541459b2eb34a4827734 (diff) | |
| parent | a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768 (diff) | |
| download | mariadb-git-febe1e850342ea52ce0900ba5767852b0aa42dc7.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index b515578eb05..d7f549899f2 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -4168,6 +4168,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) Statement stmt_backup; Query_arena *old_stmt_arena; bool error= TRUE; + bool qc_executed= FALSE; char saved_cur_db_name_buf[SAFE_NAME_LEN+1]; LEX_STRING saved_cur_db_name= @@ -4290,6 +4291,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) thd->lex->sql_command= SQLCOM_SELECT; status_var_increment(thd->status_var.com_stat[SQLCOM_SELECT]); thd->update_stats(); + qc_executed= TRUE; } } @@ -4328,7 +4330,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) thd->set_statement(&stmt_backup); thd->stmt_arena= old_stmt_arena; - if (state == Query_arena::STMT_PREPARED) + if (state == Query_arena::STMT_PREPARED && !qc_executed) state= Query_arena::STMT_EXECUTED; if (error == 0 && this->lex->sql_command == SQLCOM_CALL) |