georg Mon Jul 26 01:45:41 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/mysqli mysqli_prop.c
Log:
MFH: fixed bug in mysqli->client_version
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.8&r2=1.1760.2.9&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.8 php-src/NEWS:1.1760.2.9
--- php-src/NEWS:1.1760.2.8 Sun Jul 25 13:38:44 2004
+++ php-src/NEWS Mon Jul 26 01:45:40 2004
@@ -14,6 +14,7 @@
raise an ReflectionException instead of returning NULL on failure.
(Sebastian)
- Fixed convert.* filters to consume remaining buckets_in on flush. (Sara)
+- Fixed bug in mysqli->client_version (Georg)
13 Jul 2004, PHP 5.0.0
- Updated PCRE to provide better error handling in certain cases. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14&r2=1.14.2.1&ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.14 php-src/ext/mysqli/mysqli_prop.c:1.14.2.1
--- php-src/ext/mysqli/mysqli_prop.c:1.14 Wed Jul 7 04:02:27 2004
+++ php-src/ext/mysqli/mysqli_prop.c Mon Jul 26 01:45:41 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_prop.c,v 1.14 2004/07/07 08:02:27 georg Exp $
+ $Id: mysqli_prop.c,v 1.14.2.1 2004/07/26 05:45:41 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -82,6 +82,15 @@
int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
+ ZVAL_LONG(*retval, MYSQL_VERSION_ID);
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ property link_client_info_read */
+int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
+ ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
return SUCCESS;
}
@@ -191,6 +200,7 @@
mysqli_property_entry mysqli_link_property_entries[] = {
{"affected_rows", link_affected_rows_read, NULL},
+ {"client_info", link_client_info_read, NULL},
{"client_version", link_client_version_read, NULL},
{"test", link_test_read, NULL},
{"connect_errno", link_connect_errno_read, NULL},
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
