iliaa Wed Sep 14 11:34:58 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql mysql_driver.c
Log:
MFH: Fix error detection for queries such as OPTIMIZE
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.1&r2=1.59.2.2&ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.1
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.2
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.1 Wed Aug 31 00:06:10 2005
+++ php-src/ext/pdo_mysql/mysql_driver.c Wed Sep 14 11:34:58 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_driver.c,v 1.59.2.1 2005/08/31 04:06:10 gschlossnagle Exp $ */
+/* $Id: mysql_driver.c,v 1.59.2.2 2005/09/14 15:34:58 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -234,8 +234,13 @@
pdo_mysql_error(dbh);
return -1;
} else {
- my_ulonglong c= mysql_affected_rows(H->server);
- return c != (my_ulonglong)-1 ? c:(pdo_mysql_error(dbh),-1);
+ my_ulonglong c = mysql_affected_rows(H->server);
+ if (c != (my_ulonglong) -1) {
+ pdo_mysql_error(dbh);
+ return (H->einfo.errcode ? -1 : 0);
+ } else {
+ return c;
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
