diff options
| author | Georg Richter <georg@php.net> | 2005-01-27 10:18:28 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2005-01-27 10:18:28 +0000 |
| commit | 71489199400c1f17b4743e1322af7ffd2bd43be0 (patch) | |
| tree | e2d4a45ee512b30c5ee9a7a218fff79745365462 /ext/mysqli | |
| parent | 969860b57060d432bf023291669e5b462dad988f (diff) | |
| download | php-git-71489199400c1f17b4743e1322af7ffd2bd43be0.tar.gz | |
fix for bug #31710 (return value for mysql_rollback is reverted)
fixed also same behaviour for mysql_commit and mysql_autocommit
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 8082291d38..132456837a 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -54,7 +54,6 @@ PHP_FUNCTION(mysqli_autocommit) { MY_MYSQL *mysql; zval *mysql_link; - unsigned long rc; unsigned long automode; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ob", &mysql_link, mysqli_link_class_entry, &automode) == FAILURE) { @@ -62,9 +61,10 @@ PHP_FUNCTION(mysqli_autocommit) } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link"); - rc = (long) mysql_autocommit(mysql->mysql, automode); - - RETURN_BOOL(rc); + if (mysql_autocommit(mysql->mysql, automode)) { + RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ @@ -417,14 +417,15 @@ PHP_FUNCTION(mysqli_commit) { MY_MYSQL *mysql; zval *mysql_link; - ulong rc; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link"); - rc = mysql_commit(mysql->mysql); - RETURN_BOOL(rc); + if (mysql_commit(mysql->mysql)) { + RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ @@ -1396,7 +1397,10 @@ PHP_FUNCTION(mysqli_rollback) } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link"); - RETURN_BOOL(mysql_rollback(mysql->mysql)); + if (mysql_rollback(mysql->mysql)) { + RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ |