diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 22:36:21 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 22:36:21 -0300 |
| commit | bba8d5ca9b3bcb4fd9685e8af6bae6de0c9b7be7 (patch) | |
| tree | 1b0b99de278ce9cb5a458afc12e6cc2280a885b6 /sql/sql_prepare.cc | |
| parent | 936217aac915f068deeef03544287411ddddba94 (diff) | |
| parent | 32372a756f95c26f762c8a80ccfeaebb8d59e269 (diff) | |
| download | mariadb-git-bba8d5ca9b3bcb4fd9685e8af6bae6de0c9b7be7.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 089e751900e..a9c4f3f090d 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -352,8 +352,11 @@ static bool send_prep_stmt(Prepared_statement *stmt, uint columns) &stmt->lex->param_list, Protocol::SEND_EOF); } - /* Flag that a response has already been sent */ - thd->stmt_da->disable_status(); + + if (!error) + /* Flag that a response has already been sent */ + thd->stmt_da->disable_status(); + DBUG_RETURN(error); } #else |