derick Wed Apr 13 17:27:36 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/pgsql pgsql.c php_pgsql.h
Log:
- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.874&r2=1.1247.2.875&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.874 php-src/NEWS:1.1247.2.875
--- php-src/NEWS:1.1247.2.874 Wed Apr 13 04:08:25 2005
+++ php-src/NEWS Wed Apr 13 17:27:32 2005
@@ -3,6 +3,8 @@
?? ??? 20??, Version 4.?.?
- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
them sort based on the current locale. (Derick)
+- Fixed bug #32699 (pg_affected_rows() was defined when it was not available).
+ (Derick)
- Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani)
- Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets).
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.244.2.36&r2=1.244.2.37&ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.36
php-src/ext/pgsql/pgsql.c:1.244.2.37
--- php-src/ext/pgsql/pgsql.c:1.244.2.36 Wed May 12 12:49:56 2004
+++ php-src/ext/pgsql/pgsql.c Wed Apr 13 17:27:34 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.244.2.36 2004/05/12 16:49:56 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.37 2005/04/13 21:27:34 derick Exp $ */
#include <stdlib.h>
@@ -100,7 +100,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)
@@ -1077,6 +1079,7 @@
}
/* }}} */
+#if HAVE_PQCMDTUPLES
/* {{{ proto int pg_affected_rows(resource result)
Returns the number of affected tuples */
PHP_FUNCTION(pg_affected_rows)
@@ -1084,6 +1087,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.56.2.3&r2=1.56.2.4&ty=u
Index: php-src/ext/pgsql/php_pgsql.h
diff -u php-src/ext/pgsql/php_pgsql.h:1.56.2.3
php-src/ext/pgsql/php_pgsql.h:1.56.2.4
--- php-src/ext/pgsql/php_pgsql.h:1.56.2.3 Sat May 31 08:59:19 2003
+++ php-src/ext/pgsql/php_pgsql.h Wed Apr 13 17:27:35 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pgsql.h,v 1.56.2.3 2003/05/31 12:59:19 helly Exp $ */
+/* $Id: php_pgsql.h,v 1.56.2.4 2005/04/13 21:27:35 derick Exp $ */
#ifndef PHP_PGSQL_H
#define PHP_PGSQL_H
@@ -83,7 +83,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
