cvs: php-src(PHP_5_1) /ext/pdo_mysql mysql_driver.c /ext/pdo_mysql/tests pecl_bug_5780.phpt

From: Date: Sat, 29 Oct 2005 02:36:30 +0000
Subject: cvs: php-src(PHP_5_1) /ext/pdo_mysql mysql_driver.c /ext/pdo_mysql/tests pecl_bug_5780.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-34856@lists.php.net to get a copy of this message
wez Fri Oct 28 22:36:30 2005 EDT Added files: (Branch: PHP_5_1) /php-src/ext/pdo_mysql/tests pecl_bug_5780.phpt Modified files: /php-src/ext/pdo_mysql mysql_driver.c Log: Close PECL Bug #5780 http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.4&r2=1.59.2.5&ty=u Index: php-src/ext/pdo_mysql/mysql_driver.c diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.4 php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.5 --- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.4 Thu Oct 27 13:34:24 2005 +++ php-src/ext/pdo_mysql/mysql_driver.c Fri Oct 28 22:36:30 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql_driver.c,v 1.59.2.4 2005/10/27 17:34:24 tony2001 Exp $ */ +/* $Id: mysql_driver.c,v 1.59.2.5 2005/10/29 02:36:30 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -58,7 +58,16 @@ einfo = &H->einfo; } - einfo->errcode = mysql_errno(H->server); +#if HAVE_MYSQL_STMT_PREPARE + if (S && S->stmt) { + einfo->errcode = mysql_stmt_errno(S->stmt); + } + else +#endif + { + einfo->errcode = mysql_errno(H->server); + } + einfo->file = file; einfo->line = line; http://cvs.php.net/co.php/php-src/ext/pdo_mysql/tests/pecl_bug_5780.phpt?r=1.1&p=1 Index: php-src/ext/pdo_mysql/tests/pecl_bug_5780.phpt +++ php-src/ext/pdo_mysql/tests/pecl_bug_5780.phpt

« previous php.cvs (#34856) next »