cvs: php-src /ext/mysqli mysqli_api.c /ext/mysqli/tests 074.phpt
| From: | Antony Dovgal | Date: | Wed, 12 Jul 2006 10:15:30 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli_api.c /ext/mysqli/tests 074.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39190@lists.php.net to get a copy of this message | ||
tony2001 Wed Jul 12 10:15:30 2006 UTC
Added files:
/php-src/ext/mysqli/tests 074.phpt
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
MFB: fix #38072 (boolean arg for mysqli_autocommit() is always true on Solaris)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.128&r2=1.129&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.128 php-src/ext/mysqli/mysqli_api.c:1.129
--- php-src/ext/mysqli/mysqli_api.c:1.128 Sun Jun 4 14:57:06 2006
+++ php-src/ext/mysqli/mysqli_api.c Wed Jul 12 10:15:30 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.128 2006/06/04 14:57:06 iliaa Exp $
+ $Id: mysqli_api.c,v 1.129 2006/07/12 10:15:30 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -57,14 +57,14 @@
{
MY_MYSQL *mysql;
zval *mysql_link;
- unsigned long automode;
+ zend_bool automode;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ob",
&mysql_link, mysqli_link_class_entry, &automode) == FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
- if (mysql_autocommit(mysql->mysql, automode)) {
+ if (mysql_autocommit(mysql->mysql, (my_bool)automode)) {
RETURN_FALSE;
}
RETURN_TRUE;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/074.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/074.phpt
+++ php-src/ext/mysqli/tests/074.phpt
--TEST--
mysqli_autocommit() tests
--SKIPIF--
<?php
require_once('skipif.inc');
?>
--FILE--
<?php
include "connect.inc";
$mysqli = new mysqli($host, $user, $passwd, "test");
var_dump($mysqli->autocommit(false));
$result = $mysqli->query("SELECT @@autocommit");
var_dump($result->fetch_row());
var_dump($mysqli->autocommit(true));
$result = $mysqli->query("SELECT @@autocommit");
var_dump($result->fetch_row());
?>
--EXPECT--
bool(true)
array(1) {
[0]=>
string(1) "0"
}
bool(true)
array(1) {
[0]=>
string(1) "1"
}