Permalink
Browse files

Fixed #37209 (mssql_execute with non fatal errors)

  • Loading branch information...
KalleZ committed Feb 23, 2009
1 parent 0f3831a commit 1783db8209b4e1beb48a2a7d7ec2f5bdfd4c3041
Showing with 8 additions and 2 deletions.
  1. +8 −2 ext/mssql/php_mssql.c
View
@@ -2101,6 +2101,7 @@ PHP_FUNCTION(mssql_execute)
mssql_result *result;
int num_fields;
int batchsize;
+ int exec_retval;
batchsize = MS_SQL_G(batchsize);
@@ -2111,10 +2112,15 @@ PHP_FUNCTION(mssql_execute)
ZEND_FETCH_RESOURCE(statement, mssql_statement *, &stmt, -1, "MS SQL-Statement", le_statement);
mssql_ptr=statement->link;
+ exec_retval = dbrpcexec(mssql_ptr->link);
- if (dbrpcexec(mssql_ptr->link)==FAIL || dbsqlok(mssql_ptr->link)==FAIL) {
+ if (exec_retval == FAIL || dbsqlok(mssql_ptr->link) == FAIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored procedure execution failed");
- dbcancel(mssql_ptr->link);
+
+ if (exec_retval == FAIL) {
+ dbcancel(mssql_ptr->link);
+ }
+
RETURN_FALSE;
}

0 comments on commit 1783db8

Please sign in to comment.