proto fixes

removed mysqli_read_query_result (will be removed in libmysql)

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index b4b30a88f33b050f369f55865fc8d5f5a430572d..d8ad53b21b3802837a62beb2617128c3bb2b8c39 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1286,26 +1286,6 @@ PHP_FUNCTION(mysqli_get_metadata)
 }
 /* }}} */
 
-/* {{{ proto bool mysqli_read_query_result(object link)
-*/
-PHP_FUNCTION(mysqli_read_query_result)
-{
-       MYSQL           *mysql;
-       zval            *mysql_link;
-
-       if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-               return;
-       }
-       MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
-
-       if (mysql_read_query_result(mysql)) {
-               RETURN_FALSE;
-       }
-
-       RETURN_TRUE;
-}
-/* }}} */
-
 /* {{{ proto bool mysqli_real_connect(object link [,string hostname [,string username [,string passwd [,string dbname [,int port [,string socket [,int flags]]]]]]])
    Open a connection to a mysql server */ 
 PHP_FUNCTION(mysqli_real_connect)
@@ -1732,19 +1712,23 @@ PHP_FUNCTION(mysqli_ssl_set)
 }
 /* }}} */
   
-/* {{{ proto string mysqli_stat(object link) 
+/* {{{ proto mixed mysqli_stat(object link) 
    Get current system status */
 PHP_FUNCTION(mysqli_stat)
 {
        MYSQL           *mysql;
        zval            *mysql_link;
+       char            *stat;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
                return;
        }
        MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link");
 
-       RETURN_STRING((char *)mysql_stat(mysql), 1);
+       if (stat = (char *)mysql_stat(mysql)) {
+               RETURN_STRING(stat, 1);
+       }
+       RETURN_FALSE;
 }
 
 /* }}} */
@@ -1781,7 +1765,7 @@ PHP_FUNCTION(mysqli_stmt_error)
 }
 /* }}} */
 
-/* {{{ proto object mysqli_stmt_store_result(stmt)
+/* {{{ proto bool mysqli_stmt_store_result(stmt)
 */
 PHP_FUNCTION(mysqli_stmt_store_result)
 {
@@ -1873,7 +1857,7 @@ PHP_FUNCTION(mysqli_thread_safe)
 
 /* }}} */
 
-/* {{{ proto object mysqli_use_result(object link)
+/* {{{ proto mixed mysqli_use_result(object link)
    Directly retrieve query results - do not buffer results on client side */
 PHP_FUNCTION(mysqli_use_result)
 {

diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 2c73241214b85e4135f6909ef0f229f8a4013830..e924b1581790c6a89e80d76677bf0292d4dd9ed9 100644 (file)
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -106,7 +106,6 @@ function_entry mysqli_functions[] = {
        PHP_FE(mysqli_prepare,                                                          NULL)
        PHP_FE(mysqli_report,                                                           NULL)
        PHP_FE(mysqli_query,                                                            NULL)
-       PHP_FE(mysqli_read_query_result,                                        NULL)
        PHP_FE(mysqli_real_connect,                                                     NULL)
        PHP_FE(mysqli_real_escape_string,                                       NULL)
        PHP_FALIAS(mysqli_escape_string, 
@@ -182,7 +181,6 @@ function_entry mysqli_link_methods[] = {
        PHP_FALIAS(ping,mysqli_ping,NULL)
        PHP_FALIAS(prepare,mysqli_prepare,NULL)
        PHP_FALIAS(query,mysqli_query,NULL)
-       PHP_FALIAS(read_query_result,mysqli_read_query_result,NULL)
        PHP_FALIAS(real_connect,mysqli_real_connect,NULL)
        PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL)
        PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)