andrey Tue Jul 12 15:22:07 2005 EDT
Modified files:
/php-src/ext/pdo_mysql mysql_driver.c mysql_statement.c
Log:
strictly check the result of mysql_affected_rows()
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.55&r2=1.56&ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.55
php-src/ext/pdo_mysql/mysql_driver.c:1.56
--- php-src/ext/pdo_mysql/mysql_driver.c:1.55 Mon Jul 11 10:46:01 2005
+++ php-src/ext/pdo_mysql/mysql_driver.c Tue Jul 12 15:22:05 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_driver.c,v 1.55 2005/07/11 14:46:01 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.56 2005/07/12 19:22:05 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -225,7 +225,8 @@
pdo_mysql_error(dbh);
return -1;
} else {
- return mysql_affected_rows(H->server);
+ my_ulonglong c= mysql_affected_rows(H->server);
+ return c != (my_ulonglong)-1 ? c:-1;
}
}
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.40&r2=1.41&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.40
php-src/ext/pdo_mysql/mysql_statement.c:1.41
--- php-src/ext/pdo_mysql/mysql_statement.c:1.40 Sat Jul 9 22:58:51 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Tue Jul 12 15:22:05 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_statement.c,v 1.40 2005/07/10 02:58:51 andrey Exp $ */
+/* $Id: mysql_statement.c,v 1.41 2005/07/12 19:22:05 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -155,9 +155,12 @@
}
}
-
- stmt->row_count = mysql_stmt_affected_rows(S->stmt);
- return 1;
+ ;
+ if ((row_count= mysql_stmt_affected_rows(S->stmt)) !=
(my_ulonglong)-1) {
+ stmt->row_count = row_count;
+ return 1;
+ }
+ return 0;
}
#endif
/* ensure that we free any previous unfetched results */
@@ -222,7 +225,11 @@
/* No more results */
return 0;
} else {
- row_count = mysql_affected_rows(H->server);
+ if ((my_ulonglong)-1 == (row_count =
mysql_affected_rows(H->server))) {
+ pdo_mysql_error_stmt(stmt);
+ return 0;
+ }
+
if (!H->buffered) {
S->result = mysql_use_result(H->server);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
