georg Mon Jul 26 01:44:06 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/mysqli mysqli_prop.c
Log:
fixed bug in mysql->client_version
added mysql->client_info property
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1775&r2=1.1776&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1775 php-src/NEWS:1.1776
--- php-src/NEWS:1.1775 Sun Jul 25 10:59:20 2004
+++ php-src/NEWS Mon Jul 26 01:44:06 2004
@@ -14,12 +14,14 @@
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
. SimpleXMLElement->registerXPathNamespace() (Christian)
+ . mysqli->client_info property (Georg)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
- Added MDTM support to ftp_url_stat. (Sara)
- Added zlib stream filter suport. (Sara)
- Added bz2 stream filter support. (Sara)
+- Fixed bug in mysql->client_version (Georg)
- Changed the implementation of TRUE, FALSE, and NULL from constants to
keywords. (Marcus)
- Fixed ZTS destruction. (Marcus)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14&r2=1.15&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.15
--- 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:44:06 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.15 2004/07/26 05:44:06 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -82,11 +82,19 @@
int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
- ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
+ 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;
+}
+/* }}} */
/* {{{ property link_test_read */
int link_test_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
@@ -191,6 +199,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