tony2001                Wed Jul 12 09:51:47 2006 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/mysqli/tests   068.phpt 

  Modified files:              
    /php-src/ext/mysqli mysqli_api.c 
    /php-src    NEWS 
  Log:
  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.118.2.22.2.4&r2=1.118.2.22.2.5&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.4 
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.5
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.4      Sun Jun  4 14:56:34 2006
+++ php-src/ext/mysqli/mysqli_api.c     Wed Jul 12 09:51:46 2006
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.4 2006/06/04 14:56:34 iliaa Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.5 2006/07/12 09:51:46 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/NEWS?r1=1.2027.2.547.2.118&r2=1.2027.2.547.2.119&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.118 php-src/NEWS:1.2027.2.547.2.119
--- php-src/NEWS:1.2027.2.547.2.118     Wed Jul 12 08:59:40 2006
+++ php-src/NEWS        Wed Jul 12 09:51:47 2006
@@ -82,6 +82,8 @@
 
 - Fixed memory leaks in openssl streams context options. (Pierre)
 - Fixed handling of extremely long paths inside tempnam() function. (Ilia)
+- Fixed bug #38072 (boolean arg for mysqli_autocommit() is always true on 
+  Solaris). (Tony)
 - Fixed bug #38067 (Parameters are not decoded from utf-8 when using encoding
   option). (Dmitry)
 - Fixed bug #38055 (Wrong interpretation of boolean parameters). (Dmitry)

http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/068.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/068.phpt
+++ php-src/ext/mysqli/tests/068.phpt
--TEST--
mysqli get_client_info
--SKIPIF--
<?php 
        require_once('skipif.inc'); 
?>
--FILE--
<?php
  $s = mysqli_get_client_info();
  echo gettype($s);
?>
--EXPECT--
string

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to