reverted Ilias changes - added get_warnings methods

(forgot to commit the file in my last commit)

diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 487fc68b17e0954b387a5c4785198328dcfa220a..3f9f2650fd190397aa87a46ffd3c7c30545e54ec 100644 (file)
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -92,6 +92,7 @@ function_entry mysqli_functions[] = {
        PHP_FE(mysqli_get_proto_info,                                           NULL)
        PHP_FE(mysqli_get_server_info,                                          NULL)
        PHP_FE(mysqli_get_server_version,                                       NULL)
+       PHP_FE(mysqli_get_warnings,                                                     NULL)
        PHP_FE(mysqli_init,                                                             NULL)
        PHP_FE(mysqli_info,                                                                     NULL)
        PHP_FE(mysqli_insert_id,                                                        NULL)
@@ -131,6 +132,7 @@ function_entry mysqli_functions[] = {
        PHP_FE(mysqli_stmt_bind_result,                                         second_arg_force_by_ref_rest)
        PHP_FE(mysqli_stmt_fetch,                                                       NULL)
        PHP_FE(mysqli_stmt_free_result,                                         NULL)
+       PHP_FE(mysqli_stmt_get_warnings,                                        NULL)
        PHP_FE(mysqli_stmt_insert_id,                                           NULL)
        PHP_FE(mysqli_stmt_reset,                                                       NULL)
        PHP_FE(mysqli_stmt_param_count,                                         NULL)
@@ -195,7 +197,7 @@ function_entry mysqli_link_methods[] = {
        PHP_FALIAS(get_charset,mysqli_get_charset,NULL)
        PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL)
        PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL)
-/* XXX: temp_fix       PHP_FALIAS(get_warnings, mysqli_warning_construct,      NULL) */
+       PHP_FALIAS(get_warnings, mysqli_get_warnings, NULL)
        PHP_FALIAS(init,mysqli_init,NULL)
        PHP_FALIAS(kill,mysqli_kill,NULL)
        PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL)
@@ -268,7 +270,7 @@ function_entry mysqli_stmt_methods[] = {
        PHP_FALIAS(data_seek,mysqli_stmt_data_seek,NULL)
        PHP_FALIAS(execute,mysqli_stmt_execute,NULL)
        PHP_FALIAS(fetch,mysqli_stmt_fetch,NULL)
-/* XXX: temp_fix       PHP_FALIAS(get_warnings, mysqli_warning_construct,      NULL) */
+       PHP_FALIAS(get_warnings, mysqli_stmt_get_warnings,      NULL)
        PHP_FALIAS(result_metadata, mysqli_stmt_result_metadata,NULL)
        PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
        PHP_FALIAS(send_long_data,mysqli_stmt_send_long_data,NULL)