com php-src: Fixes after merge: ext/mysqli/mysqli_api.c

Commit: 113f22550a32479988ff856911e916c16f8dd2e6 Author: Andrey Hristov <andrey@php.net> Thu, 20 Mar 2014 17:28:49 +0200 Parents: d2ab74588e31dee2cc9e6d2245c2b42de2a90c55 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=113f22550a32479988ff856911e916c16f8dd2e6 Log: Fixes after merge Changed paths: M ext/mysqli/mysqli_api.c Diff: diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 85b6fd9..70bdfb3 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -109,7 +109,7 @@ mysqli_escape_string_for_tx_name_in_comment(const char * const name TSRMLS_DC) /* }}} */ -/* {{{ proto bool mysqli_commit_or_rollback_libmysql */ +/* {{{ mysqli_commit_or_rollback_libmysql */ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, const unsigned int mode, const char * const name TSRMLS_DC) { int ret; @@ -707,7 +707,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status TSRM if (MyG(rollback_on_cached_plink) && #if !defined(MYSQLI_USE_MYSQLND) - mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, TRANS_COR_NO_OPT, NULL)) + mysqli_commit_or_rollback_libmysql(mysql->mysql, FALSE, TRANS_COR_NO_OPT, NULL TSRMLS_CC)) #else FAIL == mysqlnd_rollback(mysql->mysql, TRANS_COR_NO_OPT, NULL)) #endif