[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c

[Georg Richter]

georg           Thu Jan 27 05:18:30 2005 EDT

  Modified files:              
    /php-src/ext/mysqli mysqli_api.c 
  Log:
  fix for bug #31710 (return value for mysql_rollback is reverted)
  fixed also same behaviour for mysql_commit and mysql_autocommit
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.99&r2=1.100&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.99 
php-src/ext/mysqli/mysqli_api.c:1.100
--- php-src/ext/mysqli/mysqli_api.c:1.99        Wed Jan 26 20:14:43 2005
+++ php-src/ext/mysqli/mysqli_api.c     Thu Jan 27 05:18:28 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.99 2005/01/27 01:14:43 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.100 2005/01/27 10:18:28 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;
 }
 /* }}} */
 
@@ -417,14 +417,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;
 }
 /* }}} */
 
@@ -1396,7 +1397,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