[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mysqli mysqli_api.c

[Georg Richter]

georg           Thu Jan 27 05:20:21 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src    NEWS 
    /php-src/ext/mysqli mysqli_api.c 
  Log:
  MFH: fix for bug #31710
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.219&r2=1.1760.2.220&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.219 php-src/NEWS:1.1760.2.220
--- php-src/NEWS:1.1760.2.219   Wed Jan 26 20:18:13 2005
+++ php-src/NEWS        Thu Jan 27 05:20:19 2005
@@ -11,6 +11,8 @@
 - Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values). 
(Georg)
 - Fixed segfault in mysqli_fetch_field_direct() when invalid field offset 
   is passed. (Tony)
+- Fixed bug #31710 (Wrong return values for mysqli_autocommit/commit/rollback).
+  (Georg)
 - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
   (elod at itfais dot com)
 - Fixed bug #31699 (unserialize() float problem on non-English locales). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.9&r2=1.87.2.10&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.9 
php-src/ext/mysqli/mysqli_api.c:1.87.2.10
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.9    Wed Jan 26 20:11:15 2005
+++ php-src/ext/mysqli/mysqli_api.c     Thu Jan 27 05:20:21 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.87.2.9 2005/01/27 01:11:15 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.87.2.10 2005/01/27 10:20:21 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -54,7 +54,6 @@
 {
        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 @@
        }
        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 @@
 {
        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 @@
        }
        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;
 }
 /* }}} */
 

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