georg Tue Oct 31 15:23:16 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c mysqli_api.c
Log:
Fixed function headers (added missing U)
fixed socket parameter (was removed by mistake in a previous commit)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.66&r2=1.67&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.66
php-src/ext/mysqli/mysqli_nonapi.c:1.67
--- php-src/ext/mysqli/mysqli_nonapi.c:1.66 Sat Oct 7 18:24:51 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Oct 31 15:23:16 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.66 2006/10/07 18:24:51 iliaa Exp $
+ $Id: mysqli_nonapi.c,v 1.67 2006/10/31 15:23:16 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -52,6 +52,10 @@
return;
}
+ if (!socket_len) {
+ socket = NULL;
+ }
+
if (!passwd) {
passwd = MyG(default_pw);
if (!username){
@@ -157,7 +161,7 @@
}
/* }}} */
-/* {{{ proto mixed mysqli_fetch_object (object result [, string class_name [,
NULL|array ctor_params]])
+/* {{{ proto mixed mysqli_fetch_object (object result [, string class_name [,
NULL|array ctor_params]]) U
Fetch a result row as an object */
PHP_FUNCTION(mysqli_fetch_object)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.137&r2=1.138&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.137
php-src/ext/mysqli/mysqli_api.c:1.138
--- php-src/ext/mysqli/mysqli_api.c:1.137 Sun Oct 8 13:34:22 2006
+++ php-src/ext/mysqli/mysqli_api.c Tue Oct 31 15:23:16 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.137 2006/10/08 13:34:22 bjori Exp $
+ $Id: mysqli_api.c,v 1.138 2006/10/31 15:23:16 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1084,7 +1084,7 @@
}
/* }}} */
-/* {{{ proto string mysqli_info(object link)
+/* {{{ proto string mysqli_info(object link) U
Get information about the most recent query */
PHP_FUNCTION(mysqli_info)
{
@@ -1631,7 +1631,7 @@
}
/* }}} */
-/* {{{ proto int mysqli_stmt_field_count(object stmt) { U
+/* {{{ proto int mysqli_stmt_field_count(object stmt) U
Return the number of result columns for the given statement */
PHP_FUNCTION(mysqli_stmt_field_count)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
