diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-15 20:04:19 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-15 20:04:19 +0100 |
| commit | a45162d4e33152255132ec642ba7cfc60b5df1e1 (patch) | |
| tree | f620fbdf34bc1fd097954a4f39000cf9fb881476 /sql/sql_prepare.cc | |
| parent | c8141ce4c0c5280af1d1863bcf6352cb0b3730a4 (diff) | |
| parent | 8825ea3f2ad91e6e2ec4806f4ac90732a8744e15 (diff) | |
| download | mariadb-git-a45162d4e33152255132ec642ba7cfc60b5df1e1.tar.gz | |
merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 31e3baca764..94a35db3a2d 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3769,7 +3769,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) if (state == Query_arena::PREPARED) state= Query_arena::EXECUTED; - if (this->lex->sql_command == SQLCOM_CALL) + if (error == 0 && this->lex->sql_command == SQLCOM_CALL) { if (is_sql_prepare()) thd->protocol_text.send_out_parameters(&this->lex->param_list); @@ -3777,7 +3777,6 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) thd->protocol->send_out_parameters(&this->lex->param_list); } - /* Log COM_EXECUTE to the general log. Note, that in case of SQL prepared statements this causes two records to be output: |