derick Wed Apr 13 17:46:32 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/pgsql pgsql.c php_pgsql.h
Log:
- MF43: Fixed bug #32699 (pg_affected_rows() was defined when it was not
available).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.321&r2=1.1760.2.322&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.321 php-src/NEWS:1.1760.2.322
--- php-src/NEWS:1.1760.2.321 Wed Apr 13 06:10:50 2005
+++ php-src/NEWS Wed Apr 13 17:46:29 2005
@@ -2,6 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.0.5
- Removed php_check_syntax() function, never worked properly. (Ilia)
+- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
+ (Derick)
- Fixed bug #32615 (Segfault in replaceChild() using fragment when
previousSibling is NULL). (Rob)
- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani)
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.311&r2=1.311.2.1&ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.311 php-src/ext/pgsql/pgsql.c:1.311.2.1
--- php-src/ext/pgsql/pgsql.c:1.311 Wed May 12 12:49:47 2004
+++ php-src/ext/pgsql/pgsql.c Wed Apr 13 17:46:31 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.311 2004/05/12 16:49:47 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.311.2.1 2005/04/13 21:46:31 derick Exp $ */
#include <stdlib.h>
@@ -105,7 +105,9 @@
PHP_FE(pg_fetch_array, NULL)
PHP_FE(pg_fetch_object, NULL)
PHP_FE(pg_fetch_all, NULL)
+#if HAVE_PQCMDTUPLES
PHP_FE(pg_affected_rows,NULL)
+#endif
PHP_FE(pg_get_result, NULL)
PHP_FE(pg_result_seek, NULL)
PHP_FE(pg_result_status,NULL)
@@ -1156,6 +1158,7 @@
}
/* }}} */
+#if HAVE_PQCMDTUPLES
/* {{{ proto int pg_affected_rows(resource result)
Returns the number of affected tuples */
PHP_FUNCTION(pg_affected_rows)
@@ -1163,6 +1166,7 @@
php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_CMD_TUPLES);
}
/* }}} */
+#endif
/* {{{ proto string pg_last_notice(resource connection)
Returns the last notice set by the backend */
http://cvs.php.net/diff.php/php-src/ext/pgsql/php_pgsql.h?r1=1.67&r2=1.67.2.1&ty=u
Index: php-src/ext/pgsql/php_pgsql.h
diff -u php-src/ext/pgsql/php_pgsql.h:1.67
php-src/ext/pgsql/php_pgsql.h:1.67.2.1
--- php-src/ext/pgsql/php_pgsql.h:1.67 Thu Jan 8 12:32:40 2004
+++ php-src/ext/pgsql/php_pgsql.h Wed Apr 13 17:46:32 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pgsql.h,v 1.67 2004/01/08 17:32:40 sniper Exp $ */
+/* $Id: php_pgsql.h,v 1.67.2.1 2005/04/13 21:46:32 derick Exp $ */
#ifndef PHP_PGSQL_H
#define PHP_PGSQL_H
@@ -86,7 +86,9 @@
PHP_FUNCTION(pg_fetch_result);
PHP_FUNCTION(pg_fetch_row);
PHP_FUNCTION(pg_fetch_all);
+#if HAVE_PQCMDTUPLES
PHP_FUNCTION(pg_affected_rows);
+#endif
PHP_FUNCTION(pg_get_result);
PHP_FUNCTION(pg_result_seek);
PHP_FUNCTION(pg_result_status);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
