This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2

17 files changed, 80 insertions, 606 deletions

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 9309545d06..1cdab4dbd4 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -94,8 +94,8 @@ static int le_pmysqli;
 /* Destructor for mysqli entries in free_links/used_links */
 void php_mysqli_dtor_p_elements(void *data)
 {
-	MYSQL *mysql = (MYSQL *) data;
 	TSRMLS_FETCH();
+	MYSQL *mysql = (MYSQL *) data;
 	mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT);
 }
 
@@ -777,7 +777,7 @@ PHP_MINIT_FUNCTION(mysqli)
 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_READ_BUFFER_SIZE", MYSQLND_OPT_NET_READ_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
 #endif
 #ifdef MYSQLND_STRING_TO_INT_CONVERSION
-	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_YEAR_AS_INT", MYSQLND_OPT_INT_AND_YEAR_AS_INT, CONST_CS | CONST_PERSISTENT);
 #endif
 
 	/* mysqli_real_connect flags */	
@@ -794,9 +794,6 @@ PHP_MINIT_FUNCTION(mysqli)
 #if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED)
 	REGISTER_LONG_CONSTANT("MYSQLI_BG_STORE_RESULT", MYSQLI_BG_STORE_RESULT, CONST_CS | CONST_PERSISTENT);
 #endif
-#if defined (MYSQLI_USE_MYSQLND)
-	REGISTER_LONG_CONSTANT("MYSQLI_ASYNC", MYSQLI_ASYNC, CONST_CS | CONST_PERSISTENT);
-#endif
 
 	/* for mysqli_fetch_assoc */
 	REGISTER_LONG_CONSTANT("MYSQLI_ASSOC", MYSQLI_ASSOC, CONST_CS | CONST_PERSISTENT);
@@ -1275,7 +1272,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
 			fci.function_table = &ce->function_table;
 			fci.function_name = NULL;
 			fci.symbol_table = NULL;
-			fci.object_ptr = return_value;
+			fci.object_pp = &return_value;
 			fci.retval_ptr_ptr = &retval_ptr;
 			if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
 				if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
@@ -1309,7 +1306,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
 			fcc.function_handler = ce->constructor;
 			fcc.calling_scope = EG(scope);
 			fcc.called_scope = Z_OBJCE_P(return_value);
-			fcc.object_ptr = return_value;
+			fcc.object_pp = &return_value;
 
 			if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
 				zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Could not execute %s::%s()", ce->name, ce->constructor->common.function_name);
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index a3fffb62ba..b8f426ea3d 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1311,13 +1311,7 @@ PHP_FUNCTION(mysqli_info)
 PHP_FUNCTION(mysqli_init)
 {
 	MYSQLI_RESOURCE *mysqli_resource;
-	MY_MYSQL *mysql;
-
-	if (getThis() && instanceof_function(Z_OBJCE_P(getThis()), mysqli_link_class_entry TSRMLS_CC)) {
-		return;
-	}
-
-	mysql = (MY_MYSQL *)ecalloc(1, sizeof(MY_MYSQL));
+	MY_MYSQL *mysql = (MY_MYSQL *)ecalloc(1, sizeof(MY_MYSQL));
 
 #if !defined(MYSQLI_USE_MYSQLND)
 	if (!(mysql->mysql = mysql_init(NULL)))
diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
index 111aa9d4da..bc803e1d20 100644
--- a/ext/mysqli/mysqli_driver.c
+++ b/ext/mysqli/mysqli_driver.c
@@ -79,7 +79,7 @@ static int driver_report_write(mysqli_object *obj, zval *value TSRMLS_DC)
 {
 	MyG(report_mode) = Z_LVAL_P(value);
 	/*FIXME*/
-	/* zend_replace_error_handling(MyG(report_mode) & MYSQLI_REPORT_STRICT ? EH_THROW : EH_NORMAL, NULL, NULL TSRMLS_CC); */
+	zend_replace_error_handling(MyG(report_mode) & MYSQLI_REPORT_STRICT ? EH_THROW : EH_NORMAL, NULL, NULL TSRMLS_CC);
 	return SUCCESS;
 }
 /* }}} */
diff --git a/ext/mysqli/mysqli_embedded.c b/ext/mysqli/mysqli_embedded.c
index 607f36ecb1..9dba20e25c 100644
--- a/ext/mysqli/mysqli_embedded.c
+++ b/ext/mysqli/mysqli_embedded.c
@@ -32,35 +32,36 @@
 PHP_FUNCTION(mysqli_embedded_server_start)
 {
 #ifdef HAVE_EMBEDDED_MYSQLI
-	long start;
-	zval *args;
-	zval *grps;
-
 	int	argc = 0;
 	char **arguments;
 	char **groups;
+	zval **args, **grps, **start;
 	HashPosition pos;
 	int index, rc;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "laa", &start, &args, &grps) == FAILURE) {
-		return;
+	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &start, &args, &grps) == FAILURE) {
+		ZEND_WRONG_PARAM_COUNT();
 	}
 
-	if (!start) {
+	convert_to_long_ex(start);
+	convert_to_array_ex(args);
+	convert_to_array_ex(grps);
+
+	if (!Z_LVAL_PP(start)) {
 		mysql_server_init(-1,NULL, NULL);
 		RETURN_TRUE;
 	}
 	/* get arguments */
-	if ((argc = zend_hash_num_elements(HASH_OF(args)))) {
+	if ((argc = zend_hash_num_elements(HASH_OF(*args)))) {
 		arguments = safe_emalloc(sizeof(char *), argc + 1, 0);
 		arguments[0] = NULL; 
 
-		zend_hash_internal_pointer_reset_ex(HASH_OF(args), &pos);
+		zend_hash_internal_pointer_reset_ex(HASH_OF(*args), &pos);
 
-		for (index = 0;; zend_hash_move_forward_ex(HASH_OF(args), &pos))	{
+		for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*args), &pos))	{
 			zval **item;
 
-			if (zend_hash_get_current_data_ex(HASH_OF(args), (void **) &item, &pos) == FAILURE) {
+			if (zend_hash_get_current_data_ex(HASH_OF(*args), (void **) &item, &pos) == FAILURE) {
 				break;
 			}
 
@@ -72,16 +73,16 @@ PHP_FUNCTION(mysqli_embedded_server_start)
 	}
 
 	/* get groups */
-	if ((zend_hash_num_elements(HASH_OF(grps)))) {
-		groups = safe_emalloc(sizeof(char *), zend_hash_num_elements(HASH_OF(grps)) + 1, 0);
+	if ((zend_hash_num_elements(HASH_OF(*grps)))) {
+		groups = safe_emalloc(sizeof(char *), zend_hash_num_elements(HASH_OF(*grps)) + 1, 0);
 		groups[0] = NULL; 
 
-		zend_hash_internal_pointer_reset_ex(HASH_OF(grps), &pos);
+		zend_hash_internal_pointer_reset_ex(HASH_OF(*grps), &pos);
 
-		for (index = 0;; zend_hash_move_forward_ex(HASH_OF(grps), &pos))	{
+		for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*grps), &pos))	{
 			zval ** item;
 
-			if (zend_hash_get_current_data_ex(HASH_OF(grps), (void **) &item, &pos) == FAILURE) {
+			if (zend_hash_get_current_data_ex(HASH_OF(*grps), (void **) &item, &pos) == FAILURE) {
 				break;
 			}
 
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index c05f07a526..6184a902fb 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -30,17 +30,20 @@
 #include "php_mysqli_structs.h"
 
 
-ZEND_BEGIN_ARG_INFO(second_arg_force_by_ref_rest, 1)
-	ZEND_ARG_PASS_INFO(0)
-ZEND_END_ARG_INFO();
+static
+	ZEND_BEGIN_ARG_INFO(second_arg_force_by_ref_rest, 1)
+		ZEND_ARG_PASS_INFO(0)
+	ZEND_END_ARG_INFO();
 
-ZEND_BEGIN_ARG_INFO(third_arg_force_by_ref_rest, 1)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(0)
-ZEND_END_ARG_INFO();
+static
+	ZEND_BEGIN_ARG_INFO(third_arg_force_by_ref_rest, 1)
+		ZEND_ARG_PASS_INFO(0)
+		ZEND_ARG_PASS_INFO(0)
+	ZEND_END_ARG_INFO();
 
-ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
-ZEND_END_ARG_INFO();
+static
+	ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
+	ZEND_END_ARG_INFO();
 
 
 /* {{{ mysqli_functions[]
@@ -113,18 +116,12 @@ const zend_function_entry mysqli_functions[] = {
 	PHP_FE(mysqli_num_rows,								NULL)
 	PHP_FE(mysqli_options, 								NULL)
 	PHP_FE(mysqli_ping,									NULL)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FE(mysqli_poll,									NULL)
-#endif
 	PHP_FE(mysqli_prepare,								NULL)
 	PHP_FE(mysqli_report,								NULL)
 	PHP_FE(mysqli_query,								NULL)
 	PHP_FE(mysqli_real_connect,							NULL)
 	PHP_FE(mysqli_real_escape_string,					NULL)
 	PHP_FE(mysqli_real_query,							NULL)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FE(mysqli_reap_async_query,						NULL)
-#endif
 	PHP_FE(mysqli_rollback,								NULL)
 	PHP_FE(mysqli_select_db,							NULL)
 #ifdef HAVE_MYSQLI_SET_CHARSET
@@ -225,10 +222,6 @@ const zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(query,mysqli_query,NULL)
 	PHP_FALIAS(real_connect,mysqli_real_connect,NULL)
 	PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FALIAS(poll,mysqli_poll,NULL)
-	PHP_FALIAS(reap_async_query,mysqli_reap_async_query,NULL)
-#endif
 	PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)
 	PHP_FALIAS(real_query,mysqli_real_query,NULL)
 	PHP_FALIAS(rollback,mysqli_rollback,NULL)
@@ -290,11 +283,11 @@ const zend_function_entry mysqli_stmt_methods[] = {
 	PHP_FALIAS(fetch,mysqli_stmt_fetch,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)
 #if defined(MYSQLI_USE_MYSQLND)
-	PHP_FALIAS(more_results, mysqli_stmt_more_results,NULL)
-	PHP_FALIAS(next_result, mysqli_stmt_next_result,NULL)
+	PHP_FALIAS(more_results, mysqli_stmt_more_results, NULL)
+	PHP_FALIAS(next_result, mysqli_stmt_next_result, NULL)
 #endif
-	PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
 	PHP_FALIAS(send_long_data,mysqli_stmt_send_long_data,NULL)
 	PHP_FALIAS(stmt,mysqli_prepare,NULL)
 	PHP_FALIAS(free_result,mysqli_stmt_free_result,NULL)
diff --git a/ext/mysqli/mysqli_mysqlnd.h b/ext/mysqli/mysqli_mysqlnd.h
index bcb42e4742..baa7745e81 100644
--- a/ext/mysqli/mysqli_mysqlnd.h
+++ b/ext/mysqli/mysqli_mysqlnd.h
@@ -38,6 +38,5 @@
 #define mysqli_stmt_close(c, implicit)	mysqlnd_stmt_close((c), (implicit))
 #define mysqli_free_result(r, implicit)	mysqlnd_free_result((r), (implicit))
 #define mysqli_bg_store_result(r)		mysqlnd_bg_store_result((r))
-#define mysqli_async_query(c, q, l)		mysqlnd_async_query((c), (q), (l))
 
 #endif
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 7077aab932..81e87ac520 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -66,15 +66,6 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 	zend_rsrc_list_entry	*le;
 	mysqli_plist_entry *plist = NULL;
 
-
-#if !defined(MYSQL_USE_MYSQLND)
-	if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
-						"Headers and client library minor version mismatch. Headers:%d Library:%ld",
-						MYSQL_VERSION_ID, mysql_get_client_version());
-	}
-#endif
-
 	if (getThis() && !ZEND_NUM_ARGS() && in_ctor) {
 		RETURN_NULL();
 	}
@@ -127,9 +118,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 	if (!socket_len || !socket) {
 		socket = MyG(default_socket);
 	}
-	if (!port){
-		port = MyG(default_port);
-	}
+
 	if (!passwd) {
 		passwd = MyG(default_pw);
 		passwd_len = strlen(SAFE_STR(passwd));
@@ -533,9 +522,9 @@ PHP_FUNCTION(mysqli_query)
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty query");
 		RETURN_FALSE;
 	}
-	if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_STORE_RESULT
+	if (resultmode != MYSQLI_USE_RESULT && resultmode != MYSQLI_STORE_RESULT
 #if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED)
-		&& (resultmode & ~MYSQLI_ASYNC) != MYSQLI_BG_STORE_RESULT
+		&& resultmode != MYSQLI_BG_STORE_RESULT
 #endif
 	) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for resultmode");
@@ -547,17 +536,6 @@ PHP_FUNCTION(mysqli_query)
 	MYSQLI_DISABLE_MQ;
 
 
-#ifdef MYSQLI_USE_MYSQLND
-	if (resultmode & MYSQLI_ASYNC) {
-		if (mysqli_async_query(mysql->mysql, query, query_len)) {
-			MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
-			RETURN_FALSE;
-		}
-		mysql->async_result_fetch_type = resultmode & ~MYSQLI_ASYNC;
-		RETURN_TRUE;
-	}
-#endif
-
 	if (mysql_real_query(mysql->mysql, query, query_len)) {
 		MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
 		RETURN_FALSE;
@@ -603,244 +581,6 @@ PHP_FUNCTION(mysqli_query)
 
 
 #if defined(MYSQLI_USE_MYSQLND)
-#include "php_network.h"
-/* {{{ mysqlnd_zval_array_to_mysqlnd_array functions */
-static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_array TSRMLS_DC)
-{
-	zval **elem;
-	int i = 0, current = 0;
-
-	if (Z_TYPE_P(in_array) != IS_ARRAY) {
-		return 0;
-	}
-	*out_array = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(in_array)) + 1, sizeof(MYSQLND *));
-	for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(in_array));
-		 zend_hash_get_current_data(Z_ARRVAL_P(in_array), (void **) &elem) == SUCCESS;
-		 zend_hash_move_forward(Z_ARRVAL_P(in_array))) {
-		i++;
-		if (Z_TYPE_PP(elem) != IS_OBJECT ||
-			!instanceof_function(Z_OBJCE_PP(elem), mysqli_link_class_entry TSRMLS_CC)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter %d not a mysqli object", i);			
-		} else {
-			MY_MYSQL *mysql;
-			MYSQLI_RESOURCE *my_res;
-			mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*elem TSRMLS_CC);
-			if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
-		  		php_error_docref(NULL TSRMLS_CC, E_WARNING, "[%d] Couldn't fetch %s", i, intern->zo.ce->name);
-				continue;
-		  	}
-			mysql = (MY_MYSQL*) my_res->ptr;
-			if (MYSQLI_STATUS_VALID && my_res->status < MYSQLI_STATUS_VALID) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object %d or resource %s", i, intern->zo.ce->name);
-				continue;
-			}
-			(*out_array)[current++] = mysql->mysql;
-		}
-	}
-	return 0;
-}
-/* }}} */
-
-
-/* {{{ mysqlnd_zval_array_from_mysqlnd_array */
-static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_array TSRMLS_DC)
-{
-	MYSQLND **p = in_array;
-	HashTable *new_hash;
-	zval **elem, **dest_elem;
-	int ret = 0;
-
-	ALLOC_HASHTABLE(new_hash);
-	zend_hash_init(new_hash, zend_hash_num_elements(Z_ARRVAL_P(out_array)), NULL, ZVAL_PTR_DTOR, 0);
-
-	for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(out_array));
-		 zend_hash_get_current_data(Z_ARRVAL_P(out_array), (void **) &elem) == SUCCESS;
-		 zend_hash_move_forward(Z_ARRVAL_P(out_array)))
-	{
-		if (Z_TYPE_PP(elem) != IS_OBJECT || !instanceof_function(Z_OBJCE_PP(elem), mysqli_link_class_entry TSRMLS_CC)) {
-			continue;
-		}
-		{
-			MY_MYSQL *mysql;
-			mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*elem TSRMLS_CC);
-			mysql = (MY_MYSQL *) ((MYSQLI_RESOURCE *)intern->ptr)->ptr;
-			if (mysql->mysql == *p) {
-				zend_hash_next_index_insert(new_hash, (void *)elem, sizeof(zval *), (void **)&dest_elem);
-				if (dest_elem) {
-					zval_add_ref(dest_elem);
-				}
-				ret++;
-				p++;
-			}
-		}
-	}
-
-	/* destroy old array and add new one */
-	zend_hash_destroy(Z_ARRVAL_P(out_array));
-	efree(Z_ARRVAL_P(out_array));
-
-	zend_hash_internal_pointer_reset(new_hash);
-	Z_ARRVAL_P(out_array) = new_hash;
-
-	return 0;
-}
-/* }}} */
-
-
-/* {{{ mysqlnd_dont_poll_zval_array_from_mysqlnd_array */
-static int mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *in_zval_array, zval *out_array TSRMLS_DC)
-{
-	MYSQLND **p = in_array;
-	HashTable *new_hash;
-	zval **elem, **dest_elem;
-	int ret = 0;
-
-	ALLOC_HASHTABLE(new_hash);
-	zend_hash_init(new_hash, zend_hash_num_elements(Z_ARRVAL_P(in_zval_array)), NULL, ZVAL_PTR_DTOR, 0);
-	if (in_array) {
-		for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(in_zval_array));
-			 zend_hash_get_current_data(Z_ARRVAL_P(in_zval_array), (void **) &elem) == SUCCESS;
-			 zend_hash_move_forward(Z_ARRVAL_P(in_zval_array)))
-		{
-			MY_MYSQL *mysql;
-			mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*elem TSRMLS_CC);
-			mysql = (MY_MYSQL *) ((MYSQLI_RESOURCE *)intern->ptr)->ptr;
-			if (mysql->mysql == *p) {
-				zend_hash_next_index_insert(new_hash, (void *)elem, sizeof(zval *), (void **)&dest_elem);
-				if (dest_elem) {
-					zval_add_ref(dest_elem);
-				}
-				ret++;
-				p++;
-			}
-		}
-	}
-
-	/* destroy old array and add new one */
-	zend_hash_destroy(Z_ARRVAL_P(out_array));
-	efree(Z_ARRVAL_P(out_array));
-
-	zend_hash_internal_pointer_reset(new_hash);
-	Z_ARRVAL_P(out_array) = new_hash;
-
-	return 0;
-}
-/* }}} */
-
-
-/* {{{ proto int mysqli_poll(array read, array write, array error, long sec [, long usec]) U
-   Poll connections */
-PHP_FUNCTION(mysqli_poll)
-{
-	zval			*r_array, *e_array, *dont_poll_array;
-	MYSQLND			**new_r_array = NULL, **new_e_array = NULL, **new_dont_poll_array = NULL;
-	long			sec = 0, usec = 0;
-	enum_func_status ret;
-	uint 			desc_num;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!al|l", &r_array, &e_array, &dont_poll_array, &sec, &usec) == FAILURE) {
-		return;
-	}
-	if (sec < 0 || usec < 0) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Negative values passed for sec and/or usec");
-		RETURN_FALSE;
-	}
-
-	if (r_array != NULL) {
-		mysqlnd_zval_array_to_mysqlnd_array(r_array, &new_r_array TSRMLS_CC);
-	}
-	if (e_array != NULL) {
-		mysqlnd_zval_array_to_mysqlnd_array(e_array, &new_e_array TSRMLS_CC);
-	}
-
-	ret = mysqlnd_poll(new_r_array, new_e_array, &new_dont_poll_array, sec, usec, &desc_num);
-
-	mysqlnd_dont_poll_zval_array_from_mysqlnd_array(r_array != NULL ? new_dont_poll_array:NULL, r_array, dont_poll_array TSRMLS_CC);
-
-	if (r_array != NULL) {
-		mysqlnd_zval_array_from_mysqlnd_array(new_r_array, r_array TSRMLS_CC);
-	}
-	if (e_array != NULL) {
-		mysqlnd_zval_array_from_mysqlnd_array(new_e_array, e_array TSRMLS_CC);
-	}
-
-	if (new_dont_poll_array) {
-		efree(new_dont_poll_array);
-	}
-	if (new_r_array) {
-		efree(new_r_array);
-	}
-	if (new_e_array) {
-		efree(new_e_array);
-	}
-	if (ret == PASS) {
-		RETURN_LONG(desc_num);
-	} else {
-		RETURN_FALSE;
-	}
-}
-/* }}} */
-
-
-/* {{{ proto int mysqli_reap_async_query(object link) U
-   Poll connections */
-PHP_FUNCTION(mysqli_reap_async_query)
-{
-	MY_MYSQL		*mysql;
-	zval			*mysql_link;
-	MYSQLI_RESOURCE		*mysqli_resource;
-	MYSQL_RES 			*result;
-
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
-		return;
-	}
-
-	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID);
-
-	if (FAIL == mysqlnd_reap_async_query(mysql->mysql)) {
-		RETURN_FALSE;
-	}
-
-	if (!mysql_field_count(mysql->mysql)) {
-		/* no result set - not a SELECT */
-		if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
-/*			php_mysqli_report_index("n/a", mysqli_server_status(mysql->mysql) TSRMLS_CC); */
-		}
-		RETURN_TRUE;
-	}
-
-	switch (mysql->async_result_fetch_type) {
-		case MYSQLI_STORE_RESULT:
-			result = mysql_store_result(mysql->mysql);
-			break;
-		case MYSQLI_USE_RESULT:
-			result = mysql_use_result(mysql->mysql);
-			break;
-#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED)
-		case MYSQLI_BG_STORE_RESULT:
-			result = mysqli_bg_store_result(mysql->mysql);
-			break;
-#endif
-	}
-
-	if (!result) {
-		php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC,
-										"%s", mysql_error(mysql->mysql)); 
-		RETURN_FALSE;
-	}
-
-	if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
-/*		php_mysqli_report_index("n/a", mysqli_server_status(mysql->mysql) TSRMLS_CC); */
-	}
-
-	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
-	mysqli_resource->ptr = (void *)result;
-	mysqli_resource->status = MYSQLI_STATUS_VALID;
-	MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
-}
-/* }}} */
-
-
 /* {{{ proto object mysqli_stmt_get_result(object link) U
    Buffer result set on client */
 PHP_FUNCTION(mysqli_stmt_get_result)
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index a08ebcca9d..cf8af39cbe 100644
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -73,7 +73,7 @@ if (!obj->ptr) { \
 	p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->stmt;\
 }
 
-#define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, __ret_type, __ret_type_sprint_mod)\
+#define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, __ret_type)\
 static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
 {\
 	__ret_type l;\
@@ -86,7 +86,7 @@ static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
 			ZVAL_LONG(*retval, l);\
 		} else { \
 			char *ret; \
-			int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod, l); \
+			int ret_len = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_ulonglong)l); \
 			ZVAL_STRINGL(*retval, ret, ret_len, 0); \
 		} \
 	}\
@@ -176,7 +176,7 @@ static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 			ZVAL_LONG(*retval, rc);
 		} else {
 			char *ret;
-			int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);
+			int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_ulonglong) rc);
 			ZVAL_STRINGL(*retval, ret, l, 0);
 		}
 	}
@@ -185,18 +185,18 @@ static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 /* link properties */
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno, MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno, MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), ulong);
 MYSQLI_MAP_PROPERTY_FUNC_STRING(link_error_read, mysql_error, MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong);
 MYSQLI_MAP_PROPERTY_FUNC_STRING(link_host_info_read, mysql_get_host_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
 MYSQLI_MAP_PROPERTY_FUNC_STRING(link_info_read, mysql_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_insert_id_read, mysql_insert_id, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read, mysql_get_proto_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_insert_id_read, mysql_insert_id, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), my_ulonglong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read, mysql_get_proto_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong);
 MYSQLI_MAP_PROPERTY_FUNC_STRING(link_server_info_read, mysql_get_server_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read, mysql_get_server_version, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read, mysql_get_server_version, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong);
 MYSQLI_MAP_PROPERTY_FUNC_STRING(link_sqlstate_read, mysql_sqlstate, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong);
 /* result properties */
 
 /* {{{ property result_type_read */
@@ -235,7 +235,7 @@ static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 
 		array_init(*retval);
 
-		for (i = 0; i < p->field_count; i++) {
+		for (i=0; i < p->field_count; i++) {
 			add_index_long(*retval, i, ret[i]);
 		}
 	}
@@ -244,9 +244,9 @@ static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell, MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%llu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields, MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%llu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows, MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell, MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields, MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows, MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), my_ulonglong);
 
 /* statement properties */
 
@@ -294,7 +294,7 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 			ZVAL_LONG(*retval, rc);
 		} else {
 			char *ret;
-			int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);
+			int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, (my_ulonglong) rc);
 			ZVAL_STRINGL(*retval, ret, l, 0);
 		}
 	}
@@ -302,11 +302,11 @@ static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 }
 /* }}} */
 
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%llu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%llu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno, MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count, MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno, MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED), ulong);
 MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_error_read, mysql_stmt_error, MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED));
 MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_sqlstate_read, mysql_stmt_sqlstate, MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED));
 
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index c98484a18c..bf79c0f77f 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -97,11 +97,8 @@ typedef struct {
 	char			*hash_key;
 	zval			*li_read;
 	php_stream		*li_stream;
-	unsigned int 	multi_query;
 	zend_bool		persistent;
-#if defined(MYSQLI_USE_MYSQLND)
-	int				async_result_fetch_type;				
-#endif
+	unsigned int 	multi_query;
 } MY_MYSQL;
 
 typedef struct {
@@ -302,13 +299,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML
 #define MYSQLI_STORE_RESULT 0
 #define MYSQLI_USE_RESULT 	1
 #ifdef MYSQLI_USE_MYSQLND
-#ifdef MYSQLND_THREADED
-#define MYSQLI_BG_STORE_RESULT 	4
-#endif
-#define MYSQLI_ASYNC	 	8
-#else
-/* libmysql */
-#define MYSQLI_ASYNC	 	0
+#define MYSQLI_BG_STORE_RESULT 	101
 #endif
 
 /* for mysqli_fetch_assoc */
@@ -442,7 +433,6 @@ PHP_FUNCTION(mysqli_num_fields);
 PHP_FUNCTION(mysqli_num_rows);
 PHP_FUNCTION(mysqli_options);
 PHP_FUNCTION(mysqli_ping);
-PHP_FUNCTION(mysqli_poll);
 PHP_FUNCTION(mysqli_prepare);
 PHP_FUNCTION(mysqli_query);
 PHP_FUNCTION(mysqli_stmt_result_metadata);
@@ -451,7 +441,6 @@ PHP_FUNCTION(mysqli_read_query_result);
 PHP_FUNCTION(mysqli_real_connect);
 PHP_FUNCTION(mysqli_real_query);
 PHP_FUNCTION(mysqli_real_escape_string);
-PHP_FUNCTION(mysqli_reap_async_query);
 PHP_FUNCTION(mysqli_rollback);
 PHP_FUNCTION(mysqli_row_seek);
 PHP_FUNCTION(mysqli_select_db);
diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index fc5aae8c5e..10f8824307 100644
--- a/ext/mysqli/tests/010.phpt
+++ b/ext/mysqli/tests/010.phpt
@@ -63,6 +63,6 @@ array(7) {
   [5]=>
   float(1)
   [6]=>
-  float(8.88888914608E+14)
+  float(888888914608000)
 }
-done!
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 0efea3569c..a6a9cb6f97 100644
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli_get_metadata
 --SKIPIF--
-<?php
-require_once('skipif.inc');
+<?php 
+require_once('skipif.inc'); 
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index 9ddba23173..99bc7b6d76 100644
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -52,7 +52,7 @@ object(mysqli)#%d (%d) {
   ["field_count"]=>
   int(0)
   ["host_info"]=>
-  string(%d) "MySQL host info: %s via %s%s"
+  string(42) "MySQL host info: Localhost via UNIX socket"
   ["info"]=>
   NULL
   ["insert_id"]=>
diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt
index 003ace9d11..651ba52b5b 100644
--- a/ext/mysqli/tests/bug37090.phpt
+++ b/ext/mysqli/tests/bug37090.phpt
@@ -18,7 +18,7 @@ if (ini_get('unicode.semantics')) {
 	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$cs = array();
-	$cs[] = $mysql->set_charset("latin1");
+	$cs[] = $mysql->set_charset("latin5");
 	$cs[] = $mysql->character_set_name();
 
 	$cs[] = $mysql->set_charset("utf8");
@@ -35,7 +35,7 @@ array(6) {
   [0]=>
   bool(true)
   [1]=>
-  string(6) "latin1"
+  string(6) "latin5"
   [2]=>
   bool(true)
   [3]=>
@@ -45,4 +45,4 @@ array(6) {
   [5]=>
   string(4) "utf8"
 }
-done!
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
index 30ed9d074a..c1dc6a590a 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
@@ -60,8 +60,6 @@ require_once('skipifconnectfailure.inc');
 		/* $expected_methods['get_cache_stats']		= true; */
 		/* $expected_methods['get_client_stats']	= true; */
 		$expected_methods['get_connection_stats']	= true;
-		$expected_methods['poll']	= true;
-		$expected_methods['reap_async_query']	= true;
 	} else {
 		// libmysql only
 		if (function_exists('mysqli_ssl_set'))
diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index 6a72c249fe..d9ba6f246c 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -9,6 +9,7 @@ new mysqli()
 
 	$tmp    = NULL;
 	$link   = NULL;
+
 	ini_set('mysqli.default_socket', 'socket');
 	ini_set('mysqli.default_port', 9999);
 	ini_set('mysqli.default_pw', 'password');
@@ -35,6 +36,7 @@ new mysqli()
 		printf("[002] Usage of mysqli.default_socket failed\n");
 	}
 
+
 	ini_set('mysqli.default_port', $port);
 	try {
 		$mysqli = mysqli_init();
@@ -193,4 +195,4 @@ array(1) {
   [u"all_defaults"]=>
   unicode(13) "have been set"
 }
-done!
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 471381ef6d..6cd09c652b 100644
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -48,9 +48,6 @@ require_once('skipifconnectfailure.inc');
 		"MYSQLI_BINARY_FLAG"				=> true,
 		"MYSQLI_PART_KEY_FLAG"				=> true,
 		"MYSQLI_GROUP_FLAG"					=> true,
-		"MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED"=> true,
-		"MYSQLI_SERVER_QUERY_NO_INDEX_USED"	=> true,
-		
 		"MYSQLI_TYPE_DECIMAL"				=> true,
 		"MYSQLI_TYPE_TINY"					=> true,
 		"MYSQLI_TYPE_SHORT"					=> true,
@@ -87,8 +84,8 @@ require_once('skipifconnectfailure.inc');
 	);
 
 	/* depends on the build - experimental */
-	if ($IS_MYSQLND && defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) {
-		$expected_constants['MYSQLI_OPT_INT_AND_FLOAT_NATIVE'] = true;
+	if ($IS_MYSQLND && defined('MYSQLI_OPT_INT_AND_YEARS_AS_INT')) {
+		$expected_constants['MYSQLI_OPT_INT_AND_YEARS_AS_INT'] = true;
 	}
 
 	if ($IS_MYSQLND) {
@@ -96,7 +93,6 @@ require_once('skipifconnectfailure.inc');
 		$expected_constants['MYSQLI_OPT_NET_CMD_BUFFER_SIZE'] = true;
 		$expected_constants['MYSQLI_OPT_NET_READ_BUFFER_SIZE'] = true;
 		$expected_constants['MYSQLI_DEBUG_TRACE_ENABLED'] = true;
-		$expected_constants['MYSQLI_ASYNC'] = true;
 
 	} else {
 		$version = mysqli_get_client_version();
@@ -105,9 +101,6 @@ require_once('skipifconnectfailure.inc');
 	if (($version > 51122 && $version < 60000) || ($version > 60003) || $IS_MYSQLND) {
 		$expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
 	}
-	if ($version > 60005 || $IS_MYSQLND) {
-		$expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true;	
-	} 
 
 	if ($version > 50002) {
 		$expected_constants = array_merge($expected_constants, array(
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index e59f029ed1..042f14bd99 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -859,7 +859,7 @@ mysqlnd.collect_memory_statistics=1
 	print "done!";
 ?>
 --EXPECTF--
-array(119) {
+array(61) {
   ["bytes_sent"]=>
   string(1) "0"
   ["bytes_received"]=>
@@ -872,36 +872,6 @@ array(119) {
   string(1) "0"
   ["protocol_overhead_out"]=>
   string(1) "0"
-  ["bytes_received_ok_packet"]=>
-  string(1) "0"
-  ["bytes_received_eof_packet"]=>
-  string(1) "0"
-  ["bytes_received_rset_header_packet"]=>
-  string(1) "0"
-  ["bytes_received_rset_field_meta_packet"]=>
-  string(1) "0"
-  ["bytes_received_rset_row_packet"]=>
-  string(1) "0"
-  ["bytes_received_prepare_response_packet"]=>
-  string(1) "0"
-  ["bytes_received_change_user_packet"]=>
-  string(1) "0"
-  ["packets_sent_command"]=>
-  string(1) "0"
-  ["packets_received_ok"]=>
-  string(1) "0"
-  ["packets_received_eof"]=>
-  string(1) "0"
-  ["packets_received_rset_header"]=>
-  string(1) "0"
-  ["packets_received_rset_field_meta"]=>
-  string(1) "0"
-  ["packets_received_rset_row"]=>
-  string(1) "0"
-  ["packets_received_prepare_response"]=>
-  string(1) "0"
-  ["packets_received_change_user"]=>
-  string(1) "0"
   ["result_set_queries"]=>
   string(1) "0"
   ["non_result_set_queries"]=>
@@ -910,8 +880,6 @@ array(119) {
   string(1) "0"
   ["bad_index_used"]=>
   string(1) "0"
-  ["slow_queries"]=>
-  string(1) "0"
   ["buffered_sets"]=>
   string(1) "0"
   ["unbuffered_sets"]=>
@@ -1008,96 +976,12 @@ array(119) {
   string(1) "0"
   ["mem_calloc_ammount"]=>
   string(1) "0"
-  ["mem_realloc_count"]=>
+  ["mem_realloc_calloc"]=>
   string(1) "0"
   ["mem_realloc_ammount"]=>
   string(1) "0"
   ["mem_free_count"]=>
   string(1) "0"
-  ["proto_text_fetched_null"]=>
-  string(1) "0"
-  ["proto_text_fetched_bit"]=>
-  string(1) "0"
-  ["proto_text_fetched_tinyint"]=>
-  string(1) "0"
-  ["proto_text_fetched_short"]=>
-  string(1) "0"
-  ["proto_text_fetched_int24"]=>
-  string(1) "0"
-  ["proto_text_fetched_int"]=>
-  string(1) "0"
-  ["proto_text_fetched_bigint"]=>
-  string(1) "0"
-  ["proto_text_fetched_decimal"]=>
-  string(1) "0"
-  ["proto_text_fetched_float"]=>
-  string(1) "0"
-  ["proto_text_fetched_double"]=>
-  string(1) "0"
-  ["proto_text_fetched_date"]=>
-  string(1) "0"
-  ["proto_text_fetched_year"]=>
-  string(1) "0"
-  ["proto_text_fetched_time"]=>
-  string(1) "0"
-  ["proto_text_fetched_datetime"]=>
-  string(1) "0"
-  ["proto_text_fetched_timestamp"]=>
-  string(1) "0"
-  ["proto_text_fetched_string"]=>
-  string(1) "0"
-  ["proto_text_fetched_blob"]=>
-  string(1) "0"
-  ["proto_text_fetched_enum"]=>
-  string(1) "0"
-  ["proto_text_fetched_set"]=>
-  string(1) "0"
-  ["proto_text_fetched_geometry"]=>
-  string(1) "0"
-  ["proto_text_fetched_other"]=>
-  string(1) "0"
-  ["proto_binary_fetched_null"]=>
-  string(1) "0"
-  ["proto_binary_fetched_bit"]=>
-  string(1) "0"
-  ["proto_binary_fetched_tinyint"]=>
-  string(1) "0"
-  ["proto_binary_fetched_short"]=>
-  string(1) "0"
-  ["proto_binary_fetched_int24"]=>
-  string(1) "0"
-  ["proto_binary_fetched_int"]=>
-  string(1) "0"
-  ["proto_binary_fetched_bigint"]=>
-  string(1) "0"
-  ["proto_binary_fetched_decimal"]=>
-  string(1) "0"
-  ["proto_binary_fetched_float"]=>
-  string(1) "0"
-  ["proto_binary_fetched_double"]=>
-  string(1) "0"
-  ["proto_binary_fetched_date"]=>
-  string(1) "0"
-  ["proto_binary_fetched_year"]=>
-  string(1) "0"
-  ["proto_binary_fetched_time"]=>
-  string(1) "0"
-  ["proto_binary_fetched_datetime"]=>
-  string(1) "0"
-  ["proto_binary_fetched_timestamp"]=>
-  string(1) "0"
-  ["proto_binary_fetched_string"]=>
-  string(1) "0"
-  ["proto_binary_fetched_blob"]=>
-  string(1) "0"
-  ["proto_binary_fetched_enum"]=>
-  string(1) "0"
-  ["proto_binary_fetched_set"]=>
-  string(1) "0"
-  ["proto_binary_fetched_geometry"]=>
-  string(1) "0"
-  ["proto_binary_fetched_other"]=>
-  string(1) "0"
 }
 Testing buffered normal...
 Testing buffered normal... - SELECT id, label FROM test
@@ -1112,7 +996,7 @@ Testing unbuffered Prepared Statements... - fetching all but one
 ... done with fetch statistics
 done!
 --UEXPECTF--
-array(119) {
+array(61) {
   [u"bytes_sent"]=>
   unicode(1) "0"
   [u"bytes_received"]=>
@@ -1125,36 +1009,6 @@ array(119) {
   unicode(1) "0"
   [u"protocol_overhead_out"]=>
   unicode(1) "0"
-  [u"bytes_received_ok_packet"]=>
-  unicode(1) "0"
-  [u"bytes_received_eof_packet"]=>
-  unicode(1) "0"
-  [u"bytes_received_rset_header_packet"]=>
-  unicode(1) "0"
-  [u"bytes_received_rset_field_meta_packet"]=>
-  unicode(1) "0"
-  [u"bytes_received_rset_row_packet"]=>
-  unicode(1) "0"
-  [u"bytes_received_prepare_response_packet"]=>
-  unicode(1) "0"
-  [u"bytes_received_change_user_packet"]=>
-  unicode(1) "0"
-  [u"packets_sent_command"]=>
-  unicode(1) "0"
-  [u"packets_received_ok"]=>
-  unicode(1) "0"
-  [u"packets_received_eof"]=>
-  unicode(1) "0"
-  [u"packets_received_rset_header"]=>
-  unicode(1) "0"
-  [u"packets_received_rset_field_meta"]=>
-  unicode(1) "0"
-  [u"packets_received_rset_row"]=>
-  unicode(1) "0"
-  [u"packets_received_prepare_response"]=>
-  unicode(1) "0"
-  [u"packets_received_change_user"]=>
-  unicode(1) "0"
   [u"result_set_queries"]=>
   unicode(1) "0"
   [u"non_result_set_queries"]=>
@@ -1163,8 +1017,6 @@ array(119) {
   unicode(1) "0"
   [u"bad_index_used"]=>
   unicode(1) "0"
-  [u"slow_queries"]=>
-  unicode(1) "0"
   [u"buffered_sets"]=>
   unicode(1) "0"
   [u"unbuffered_sets"]=>
@@ -1261,96 +1113,12 @@ array(119) {
   unicode(1) "0"
   [u"mem_calloc_ammount"]=>
   unicode(1) "0"
-  [u"mem_realloc_count"]=>
+  [u"mem_realloc_calloc"]=>
   unicode(1) "0"
   [u"mem_realloc_ammount"]=>
   unicode(1) "0"
   [u"mem_free_count"]=>
   unicode(1) "0"
-  [u"proto_text_fetched_null"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_bit"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_tinyint"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_short"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_int24"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_int"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_bigint"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_decimal"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_float"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_double"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_date"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_year"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_time"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_datetime"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_timestamp"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_unicode"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_blob"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_enum"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_set"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_geometry"]=>
-  unicode(1) "0"
-  [u"proto_text_fetched_other"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_null"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_bit"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_tinyint"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_short"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_int24"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_int"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_bigint"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_decimal"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_float"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_double"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_date"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_year"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_time"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_datetime"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_timestamp"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_unicode"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_blob"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_enum"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_set"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_geometry"]=>
-  unicode(1) "0"
-  [u"proto_binary_fetched_other"]=>
-  unicode(1) "0"
 }
 Testing buffered normal...
 Testing buffered normal... - SELECT id, label FROM test