cvs: php-src /ext/pdo_mysql mysql_driver.c

iliaa Wed Sep 14 11:34:44 2005 EDT Modified files: /php-src/ext/pdo_mysql mysql_driver.c Log: Fix error detection for queries such as OPTIMIZE http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.64&r2=1.65&ty=u Index: php-src/ext/pdo_mysql/mysql_driver.c diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.64 php-src/ext/pdo_mysql/mysql_driver.c:1.65 --- php-src/ext/pdo_mysql/mysql_driver.c:1.64 Sun Sep 11 01:08:47 2005 +++ php-src/ext/pdo_mysql/mysql_driver.c Wed Sep 14 11:34:42 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql_driver.c,v 1.64 2005/09/11 05:08:47 wez Exp $ */ +/* $Id: mysql_driver.c,v 1.65 2005/09/14 15:34:42 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; + } } }