cvs: php-src(PHP_5_0) / NEWS /ext/mysqli mysqli_api.c php_mysqli.h

georg Thu Sep 2 00:52:07 2004 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/mysqli mysqli_api.c php_mysqli.h Log: fixed compiler warnings fixed bug #29283 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.64&r2=1.1760.2.65&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.64 php-src/NEWS:1.1760.2.65 --- php-src/NEWS:1.1760.2.64 Sat Aug 28 08:20:41 2004 +++ php-src/NEWS Thu Sep 2 00:52:07 2004 @@ -30,6 +30,7 @@ (Christian, Rob) - Fixed bug #29656 (segfault on result and statement properties). (Georg) - Fixed bug #29447 (Reflection API issues). (Marcus) +- Fixed bug #29283 (Invalid statement handle in mysqli on execute). (Georg) - Fixed bug #27994 (segfault with Soapserver when WSDL-Cache is enabled). (Dmitry) - Fixed bug #27791 (Apache 2.0 SAPI build against Apache 2 HEAD). (Joe Orton, http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.2&r2=1.87.2.3&ty=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.2 php-src/ext/mysqli/mysqli_api.c:1.87.2.3 --- php-src/ext/mysqli/mysqli_api.c:1.87.2.2 Thu Aug 12 18:11:46 2004 +++ php-src/ext/mysqli/mysqli_api.c Thu Sep 2 00:52:07 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.87.2.2 2004/08/12 22:11:46 georg Exp $ + $Id: mysqli_api.c,v 1.87.2.3 2004/09/02 04:52:07 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -1726,7 +1726,7 @@ } MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt"); - if (rc = mysql_stmt_attr_set(stmt->stmt, attr, (void *)&mode)) { + if ((rc = mysql_stmt_attr_set(stmt->stmt, attr, (void *)&mode))) { RETURN_FALSE; } RETURN_TRUE; @@ -1748,7 +1748,7 @@ } MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt"); - if (rc = mysql_stmt_attr_get(stmt->stmt, attr, &value)) { + if ((rc = mysql_stmt_attr_get(stmt->stmt, attr, &value))) { RETURN_FALSE; } RETURN_LONG(value); http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.38&r2=1.38.2.1&ty=u Index: php-src/ext/mysqli/php_mysqli.h diff -u php-src/ext/mysqli/php_mysqli.h:1.38 php-src/ext/mysqli/php_mysqli.h:1.38.2.1 --- php-src/ext/mysqli/php_mysqli.h:1.38 Wed Jul 7 04:02:27 2004 +++ php-src/ext/mysqli/php_mysqli.h Thu Sep 2 00:52:07 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: php_mysqli.h,v 1.38 2004/07/07 08:02:27 georg Exp $ + $Id: php_mysqli.h,v 1.38.2.1 2004/09/02 04:52:07 georg Exp $ */ /* A little hack to prevent build break, when mysql is used together with @@ -180,7 +180,7 @@ } \ __ptr = (__type)my_res->ptr; \ if (!strcmp((char *)__name, "mysqli_stmt")) {\ - if (!((MYSQL_STMT *)__ptr)->mysql) {\ + if (! ((MY_STMT *)__ptr)->stmt->mysql) {\ php_error(E_WARNING, "Statement isn't valid anymore");\ RETURN_NULL();\ }\