cvs: php-src /ext/mysqli EXPERIMENTAL mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c mysqli_prop.c mysqli_report.c php_mysqli.h

georg Wed Jan 28 17:51:55 2004 EDT Removed files: /php-src/ext/mysqli EXPERIMENTAL Modified files: /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c mysqli_prop.c mysqli_report.c php_mysqli.h Log: removed experimental status fixed bug in mysqli_data_seek (thx to Andrey "Effendi" Hristov) various prototype fixes moved some methods to properties which are part of mysql struct added function mysqli_get_server_version

http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.25&r2=1.26&ty=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.25 php-src/ext/mysqli/mysqli.c:1.26 --- php-src/ext/mysqli/mysqli.c:1.25 Thu Jan 8 03:16:25 2004 +++ php-src/ext/mysqli/mysqli.c Wed Jan 28 17:51:54 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.25 2004/01/08 08:16:25 andi Exp $ + $Id: mysqli.c,v 1.26 2004/01/28 22:51:54 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -386,8 +386,6 @@ REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_NO_SCHEMA", CLIENT_NO_SCHEMA, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_MULTI_QUERIES", CLIENT_MULTI_QUERIES, CONST_CS | CONST_PERSISTENT); - /* for mysqli_query */ REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT", 0, CONST_CS | CONST_PERSISTENT); @@ -418,7 +416,7 @@ REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TINY", FIELD_TYPE_TINY, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_SHORT", FIELD_TYPE_SHORT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_LONG", FIELD_TYPE_LONG, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQLI_TYPE_FLOAD", FIELD_TYPE_FLOAT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MYSQLI_TYPE_FLOAT", FIELD_TYPE_FLOAT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DOUBLE", FIELD_TYPE_DOUBLE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_NULL", FIELD_TYPE_NULL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TIMESTAMP", FIELD_TYPE_TIMESTAMP, CONST_CS | CONST_PERSISTENT); @@ -458,8 +456,8 @@ /* reporting */ REGISTER_LONG_CONSTANT("MYSQLI_REPORT_INDEX", MYSQLI_REPORT_INDEX, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_REPORT_ERROR", MYSQLI_REPORT_ERROR, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQLI_REPORT_CLOSE", MYSQLI_REPORT_CLOSE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_REPORT_ALL", MYSQLI_REPORT_ALL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MYSQLI_REPORT_OFF", 0, CONST_CS | CONST_PERSISTENT); return SUCCESS; } http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.66&r2=1.67&ty=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.66 php-src/ext/mysqli/mysqli_api.c:1.67 --- php-src/ext/mysqli/mysqli_api.c:1.66 Tue Jan 27 08:56:03 2004 +++ php-src/ext/mysqli/mysqli_api.c Wed Jan 28 17:51:54 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.66 2004/01/27 13:56:03 georg Exp $ + $Id: mysqli_api.c,v 1.67 2004/01/28 22:51:54 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -439,7 +439,7 @@ RETURN_FALSE; } - if (!offset || offset >= result->row_count) { + if (offset < 0 || offset >= result->row_count) { RETURN_FALSE; } @@ -914,7 +914,7 @@ } /* }}} */ -/* {{{ proto int mysqli_free_result(object result) +/* {{{ proto void mysqli_free_result(object result) Free query result memory for the given result handle */ PHP_FUNCTION(mysqli_free_result) { @@ -929,7 +929,7 @@ mysql_free_result(result); MYSQLI_CLEAR_RESOURCE(&mysql_result); - RETURN_TRUE; + return; } /* }}} */ @@ -941,6 +941,14 @@ } /* }}} */ +/* {{{ proto int mysqli_get_client_version(void) + Get MySQL client info */ +PHP_FUNCTION(mysqli_get_client_version) +{ + RETURN_LONG((long)mysql_get_client_version()); +} +/* }}} */ + /* {{{ proto string mysqli_get_host_info (object link) Get MySQL host info */ PHP_FUNCTION(mysqli_get_host_info) http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.27&r2=1.28&ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.27 php-src/ext/mysqli/mysqli_fe.c:1.28 --- php-src/ext/mysqli/mysqli_fe.c:1.27 Tue Jan 27 08:23:54 2004 +++ php-src/ext/mysqli/mysqli_fe.c Wed Jan 28 17:51:54 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_fe.c,v 1.27 2004/01/27 13:23:54 georg Exp $ + $Id: mysqli_fe.c,v 1.28 2004/01/28 22:51:54 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -86,6 +86,7 @@ PHP_FE(mysqli_field_tell, NULL) PHP_FE(mysqli_free_result, NULL) PHP_FE(mysqli_get_client_info, NULL) + PHP_FE(mysqli_get_client_version, NULL) PHP_FE(mysqli_get_host_info, NULL) PHP_FE(mysqli_get_metadata, NULL) PHP_FE(mysqli_get_proto_info, NULL) @@ -167,10 +168,8 @@ PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL) PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL) PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL) - PHP_FALIAS(get_host_info,mysqli_get_host_info,NULL) PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL) PHP_FALIAS(init,mysqli_init,NULL) - PHP_FALIAS(info,mysqli_info,NULL) PHP_FALIAS(kill,mysqli_kill,NULL) PHP_FALIAS(master_query,mysqli_master_query,NULL) PHP_FALIAS(mysqli, mysqli_connect, NULL) http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.28&r2=1.29&ty=u Index: php-src/ext/mysqli/mysqli_nonapi.c diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.28 php-src/ext/mysqli/mysqli_nonapi.c:1.29 --- php-src/ext/mysqli/mysqli_nonapi.c:1.28 Mon Jan 26 02:39:57 2004 +++ php-src/ext/mysqli/mysqli_nonapi.c Wed Jan 28 17:51:54 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_nonapi.c,v 1.28 2004/01/26 07:39:57 georg Exp $ + $Id: mysqli_nonapi.c,v 1.29 2004/01/28 22:51:54 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -210,7 +210,7 @@ } /* }}} */ -/* {{{ proto resource mysqli_query(object link, string query [,int resultmode]) */ +/* {{{ proto mixed mysqli_query(object link, string query [,int resultmode]) */ PHP_FUNCTION(mysqli_query) { MYSQL *mysql; http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.7&r2=1.8&ty=u Index: php-src/ext/mysqli/mysqli_prop.c diff -u php-src/ext/mysqli/mysqli_prop.c:1.7 php-src/ext/mysqli/mysqli_prop.c:1.8 --- php-src/ext/mysqli/mysqli_prop.c:1.7 Thu Jan 8 12:32:31 2004 +++ php-src/ext/mysqli/mysqli_prop.c Wed Jan 28 17:51:54 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_prop.c,v 1.7 2004/01/08 17:32:31 sniper Exp $ + $Id: mysqli_prop.c,v 1.8 2004/01/28 22:51:54 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -94,6 +94,15 @@ } /* }}} */ +/* {{{ property link_server_version_read */ +int link_server_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) { + MYSQL *mysql = (MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; + ALLOC_ZVAL(*retval); + ZVAL_LONG(*retval, mysql_get_server_version(mysql)); + return SUCCESS; +} +/* }}} */ + /* {{{ property link_connect_error_read */ int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC) { ALLOC_ZVAL(*retval); @@ -117,7 +126,7 @@ MYSQLI_MAP_PROPERTY_LONG(link_server_capabilities_read, MYSQL, server_capabilities); MYSQLI_MAP_PROPERTY_LONG(link_server_language_read, MYSQL, server_language); MYSQLI_MAP_PROPERTY_LONG(link_server_status_read, MYSQL, server_status); -MYSQLI_MAP_PROPERTY_STRING(link_server_version_read, MYSQL, server_version); +MYSQLI_MAP_PROPERTY_STRING(link_server_info_read, MYSQL, server_version); MYSQLI_MAP_PROPERTY_STRING(link_sqlstate_read, MYSQL, net.sqlstate); MYSQLI_MAP_PROPERTY_LONG(link_thread_id_read, MYSQL, thread_id); MYSQLI_MAP_PROPERTY_STRING(link_user_read, MYSQL, user); @@ -191,7 +200,8 @@ {"insert_id", link_insert_id_read, NULL}, {"server_capabilities", link_server_capabilities_read, NULL}, {"server_status", link_server_status_read, NULL}, - {"server_version", link_server_version_read, NULL}, + {"server_info", link_server_info_read, NULL}, + {"server_version", link_server_version_read, NULL}, {"sqlstate", link_sqlstate_read, NULL}, {"port", link_port_read, NULL}, {"protocol_version", link_protocol_version_read, NULL}, http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_report.c?r1=1.5&r2=1.6&ty=u Index: php-src/ext/mysqli/mysqli_report.c diff -u php-src/ext/mysqli/mysqli_report.c:1.5 php-src/ext/mysqli/mysqli_report.c:1.6 --- php-src/ext/mysqli/mysqli_report.c:1.5 Thu Jan 8 03:16:25 2004 +++ php-src/ext/mysqli/mysqli_report.c Wed Jan 28 17:51:54 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_report.c,v 1.5 2004/01/08 08:16:25 andi Exp $ + $Id: mysqli_report.c,v 1.6 2004/01/28 22:51:54 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -33,18 +33,11 @@ { int flags; - if (MyG(report_mode)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Report level already set."); - RETURN_FALSE; - } if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) == FAILURE) { return; } - if (!flags) { - RETURN_FALSE; - } MyG(report_mode) = flags; RETURN_TRUE; http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.29&r2=1.30&ty=u Index: php-src/ext/mysqli/php_mysqli.h diff -u php-src/ext/mysqli/php_mysqli.h:1.29 php-src/ext/mysqli/php_mysqli.h:1.30 --- php-src/ext/mysqli/php_mysqli.h:1.29 Thu Jan 22 22:28:56 2004 +++ php-src/ext/mysqli/php_mysqli.h Wed Jan 28 17:51:54 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: php_mysqli.h,v 1.29 2004/01/23 03:28:56 sniper Exp $ + $Id: php_mysqli.h,v 1.30 2004/01/28 22:51:54 georg Exp $ */ /* A little hack to prevent build break, when mysql is used together with @@ -229,6 +229,7 @@ #define FETCH_RESULT 2 /*** REPORT MODES ***/ +#define MYSQLI_REPORT_OFF 0 #define MYSQLI_REPORT_INDEX 1 #define MYSQLI_REPORT_ERROR 2 #define MYSQLI_REPORT_CLOSE 4 @@ -294,6 +295,7 @@ PHP_FUNCTION(mysqli_field_tell); PHP_FUNCTION(mysqli_free_result); PHP_FUNCTION(mysqli_get_client_info); +PHP_FUNCTION(mysqli_get_client_version); PHP_FUNCTION(mysqli_get_host_info); PHP_FUNCTION(mysqli_get_proto_info); PHP_FUNCTION(mysqli_get_server_info);