mysql_prepare_result -> mysqli_get_metadata

This function was renamed in libmysql (changeset 1.607 by monty)

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 3331e15698d4592e829bf567e969ad43a7c07161..6e0e4084108d6448dc5ef000488b119565d980bb 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1325,9 +1325,9 @@ PHP_FUNCTION(mysqli_prepare)
 }
 /* }}} */
 
-/* {{{ proto resource mysqli_prepare_result(object stmt)
+/* {{{ proto resource mysqli_get_metadata(object stmt)
  */
-PHP_FUNCTION(mysqli_prepare_result)
+PHP_FUNCTION(mysqli_get_metadata)
 {
        STMT                    *stmt;
        MYSQL_RES               *result;
@@ -1340,7 +1340,7 @@ PHP_FUNCTION(mysqli_prepare_result)
        }
        MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
        
-       if (!(result = mysql_prepare_result(stmt->stmt))){
+       if (!(result = mysql_get_metadata(stmt->stmt))){
                RETURN_FALSE;
        }
 

diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 36de49baba0edd44842234d32e04b3cae95385be..925968b951b6f7b4a90d8be13de2fb3dbb10b954 100644 (file)
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -98,7 +98,7 @@ function_entry mysqli_functions[] = {
        PHP_FE(mysqli_param_count,                                                      NULL)
        PHP_FE(mysqli_ping,                                                                     NULL)
        PHP_FE(mysqli_prepare,                                                          NULL)
-       PHP_FE(mysqli_prepare_result,                                           NULL)
+       PHP_FE(mysqli_get_metadata,                                                     NULL)
        PHP_FE(mysqli_profiler,                                                         NULL)
        PHP_FE(mysqli_query,                                                            NULL)
        PHP_FE(mysqli_read_query_result,                                        NULL)
@@ -238,16 +238,17 @@ function_entry mysqli_stmt_methods[] = {
        PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL)
        PHP_FALIAS(bind_param,mysqli_bind_param,second_arg_force_by_ref_rest)
        PHP_FALIAS(bind_result,mysqli_bind_result, all_args_by_ref)
-       PHP_FALIAS(execute,mysqli_execute,NULL)
-       PHP_FALIAS(fetch,mysqli_fetch,NULL)
-       PHP_FALIAS(param_count,mysqli_param_count,NULL)
-       PHP_FALIAS(send_long_data,mysqli_send_long_data,NULL)
-       PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
        PHP_FALIAS(close,mysqli_stmt_close,NULL)
        PHP_FALIAS(data_seek,mysqli_stmt_data_seek,NULL)
        PHP_FALIAS(errno,mysqli_stmt_errno,NULL)
        PHP_FALIAS(error,mysqli_stmt_error,NULL)
+       PHP_FALIAS(execute,mysqli_execute,NULL)
+       PHP_FALIAS(fetch,mysqli_fetch,NULL)
+       PHP_FALIAS(get_metadata, mysqli_get_metadata,NULL)
        PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
+       PHP_FALIAS(param_count,mysqli_param_count,NULL)
+       PHP_FALIAS(send_long_data,mysqli_send_long_data,NULL)
+       PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
 #if MYSQL_VERSION_ID >= 40101
        PHP_FALIAS(sqlstate, mysqli_stmt_sqlstate,NULL)
 #endif

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index e437f754be10551cebf91318eff0374b903ea476..8ae19652fcb19fbecb96a77949da9a3701738e39 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -245,7 +245,7 @@ PHP_FUNCTION(mysqli_param_count);
 PHP_FUNCTION(mysqli_ping);
 PHP_FUNCTION(mysqli_prepare);
 PHP_FUNCTION(mysqli_query);
-PHP_FUNCTION(mysqli_prepare_result);
+PHP_FUNCTION(mysqli_get_metadata);
 PHP_FUNCTION(mysqli_profiler);
 PHP_FUNCTION(mysqli_read_query_result);
 PHP_FUNCTION(mysqli_real_connect);