summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
-rw-r--r--ext/mysqli/mysqli_api.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index f403105a92..263b362a28 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;
}
/* }}} */
@@ -418,14 +418,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;
}
/* }}} */
@@ -1398,7 +1399,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;
}
/* }}} */