various changes for profiler

1 files changed, 449 insertions, 275 deletions

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 79d75667d6..d03d43eae4 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -36,15 +36,19 @@ PHP_FUNCTION(mysqli_affected_rows)
 {
 	MYSQL 			*mysql;
 	zval  			*mysql_link;
-	my_ulonglong		rc;
+	PR_MYSQL		*prmysql;
+	my_ulonglong	rc;
+	PR_COMMAND		*prcommand;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
 	rc = mysql_affected_rows(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
 	MYSQLI_RETURN_LONG_LONG(rc);
 }
 /* }}} */
@@ -53,16 +57,23 @@ PHP_FUNCTION(mysqli_affected_rows)
 */
 PHP_FUNCTION(mysqli_autocommit)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
-	unsigned long automode;
+	MYSQL 			*mysql;
+	zval  			*mysql_link;
+	PR_MYSQL		*prmysql;
+	PR_COMMAND		*prcommand;
+	unsigned long	rc;
+	unsigned long	automode;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ob", &mysql_link, mysqli_link_class_entry, &automode) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
-	RETURN_BOOL((long) mysql_autocommit(mysql, automode));
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
+	rc = (long) mysql_autocommit(mysql, automode);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
+
+	RETURN_BOOL(rc);
 }
 /* }}} */
 
@@ -71,15 +82,18 @@ PHP_FUNCTION(mysqli_autocommit)
 
 PHP_FUNCTION(mysqli_bind_param)
 {
-	zval 		***args;
-	int     	argc = ZEND_NUM_ARGS();
-	int     	i;
-	int		num_vars;
-	int		start = 0;
-	int		ofs;
-	STMT 		*stmt;
-	MYSQL_BIND 	*bind;
-	zval		**object;
+	zval 			***args;
+	int     		argc = ZEND_NUM_ARGS();
+	int 	    	i;
+	int				num_vars;
+	int				start = 0;
+	int				ofs;
+	STMT			*stmt;
+	MYSQL_BIND		*bind;
+	zval			**object;
+	PR_STMT			*prstmt;
+	PR_COMMAND		*prcommand;
+	unsigned long	rc;
 
 	/* check if number of parameters > 2 and odd */
 	if (argc < 3 || !(argc & 1)) {
@@ -100,11 +114,11 @@ PHP_FUNCTION(mysqli_bind_param)
 			efree(args);
 			RETURN_FALSE;
 		}
-		MYSQLI_FETCH_RESOURCE(stmt, STMT *, args[0], "mysqli_stmt"); 
+		MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, args[0], "mysqli_stmt"); 
 		start = 1;
 	} else {
 		object = &(getThis());	
-		MYSQLI_FETCH_RESOURCE(stmt, STMT *, object, "mysqli_stmt"); 
+		MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, object, "mysqli_stmt"); 
 	}
 
 
@@ -162,7 +176,11 @@ PHP_FUNCTION(mysqli_bind_param)
 		}
 	}
 	
-	if (mysql_bind_param(stmt->stmt, bind)) {
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prstmt);
+	rc = mysql_bind_param(stmt->stmt, bind);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
+
+	if (rc) {
 		efree(args);
 		efree(bind);
 		RETURN_FALSE;
@@ -199,12 +217,15 @@ PHP_FUNCTION(mysqli_bind_result)
 	int     	argc = ZEND_NUM_ARGS();
 	zval		**object;
 	int     	i;
-	int		start = 0;
-	int		var_cnt;
-	int		ofs;
+	int			start = 0;
+	int			var_cnt;
+	int			ofs;
 	long		col_type;
+	ulong		rc;
 	STMT 		*stmt;
 	MYSQL_BIND 	*bind;
+	PR_STMT		*prstmt;
+	PR_COMMAND	*prcommand;
 
 	if (argc < 2)  {
 		WRONG_PARAM_COUNT;
@@ -222,11 +243,11 @@ PHP_FUNCTION(mysqli_bind_result)
 			efree(args);
 			RETURN_FALSE;
 		}
-		MYSQLI_FETCH_RESOURCE(stmt, STMT *, args[0], "mysqli_stmt"); 
+		MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, args[0], "mysqli_stmt"); 
 		start = 1;
 	} else {
 		object = &(getThis());	
-		MYSQLI_FETCH_RESOURCE(stmt, STMT *, object, "mysqli_stmt"); 
+		MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, object, "mysqli_stmt"); 
 	}
 	
 	var_cnt = argc - start;
@@ -310,7 +331,11 @@ PHP_FUNCTION(mysqli_bind_result)
 		}
 	}
 
-	if (mysql_bind_result(stmt->stmt, bind)) {
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prstmt);
+	rc = mysql_bind_result(stmt->stmt, bind);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
+
+	if (rc) {
 		efree(bind);
 		efree(args);
 		php_clear_stmt_bind(stmt);
@@ -336,17 +361,23 @@ PHP_FUNCTION(mysqli_bind_result)
 */
 PHP_FUNCTION(mysqli_change_user)
 {
-	MYSQL *mysql;
-	zval  *mysql_link = NULL;
-	char  *user, *password, *dbname;
-	int   user_len, password_len, dbname_len;
+	MYSQL 		*mysql;
+	zval  		*mysql_link = NULL;
+	char  		*user, *password, *dbname;
+	int   		user_len, password_len, dbname_len;
+	ulong		rc;
+	PR_COMMAND	*prcommand;
+	PR_MYSQL	*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osss", &mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, &dbname, &dbname_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
-	if (mysql_change_user(mysql, user, password, dbname)) {
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
+	rc = mysql_change_user(mysql, user, password, dbname);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
+	if (rc) {
 		RETURN_FALSE;
 	}
 
@@ -358,15 +389,23 @@ PHP_FUNCTION(mysqli_change_user)
 */
 PHP_FUNCTION(mysqli_character_set_name)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
+	char		*charsetname;
+	PR_COMMAND	*prcommand;
 
 	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_character_set_name(mysql), 1);
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
+
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
+	charsetname = (char *)mysql_character_set_name(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNSTRING(prcommand, charsetname);
+
+	RETURN_STRING(charsetname, 1);
 }
 /* }}} */
 
@@ -374,16 +413,26 @@ PHP_FUNCTION(mysqli_character_set_name)
    close connection */
 PHP_FUNCTION(mysqli_close)
 {
-	zval *mysql_link;
-	MYSQL *mysql;
+	zval 		*mysql_link;
+	PR_MYSQL	*prmysql;
+	MYSQL 		*mysql;
+	PR_COMMON	*current;
 	
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	mysql_close(mysql);
+
+	if (MyG(profiler)) {
+		prmysql->closed = 1;
+	}
+	current = (PR_COMMON *)prmysql;
+	if (MyG(profiler)) {
+		php_mysqli_profiler_report(current, 0);
+	}
 	MYSQLI_CLEAR_RESOURCE(&mysql_link);	
 	RETURN_TRUE;
 }
@@ -393,14 +442,20 @@ PHP_FUNCTION(mysqli_close)
 */
 PHP_FUNCTION(mysqli_commit)
 {
-	MYSQL *mysql;
-	zval *mysql_link;
+	MYSQL 		*mysql;
+	zval 		*mysql_link;
+	PR_MYSQL	*prmysql;
+	PR_COMMAND	*prcommand;
+	ulong		rc;
 
 	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_BOOL(mysql_commit(mysql));
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
+	rc = mysql_commit(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
+	RETURN_BOOL(rc);
 }
 /* }}} */
 
@@ -408,23 +463,26 @@ PHP_FUNCTION(mysqli_commit)
 */
 PHP_FUNCTION(mysqli_data_seek)
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
-	
-	long  offset;
+	MYSQL_RES	*result;
+	zval  		*mysql_result;
+	PR_RESULT	*prresult;
+	PR_COMMAND	*prcommand;
+	long  		offset;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Orl", &mysql_result, mysqli_result_class_entry, &mysql_result, &offset) == FAILURE) {
 		return;
 	}
 
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 	if (result->handle && result->handle->status == MYSQL_STATUS_USE_RESULT) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function cannot be used with MYSQL_USE_RESULT");
 		RETURN_LONG(0);
 	}
 
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prresult);
 	mysql_data_seek(result, offset);
+	MYSQLI_PROFILER_COMMAND_RETURNSTRING(prcommand, NULL);
 	return;
 }
 /* }}} */
@@ -449,14 +507,18 @@ PHP_FUNCTION(mysqli_debug)
 */
 PHP_FUNCTION(mysqli_disable_reads_from_master)
 {
-	MYSQL	*mysql;
-	zval	*mysql_link;
+	MYSQL		*mysql;
+	zval		*mysql_link;
+	PR_MYSQL	*prmysql;
+	PR_COMMAND	*prcommand;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
 	mysql_disable_reads_from_master(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNSTRING(prcommand, NULL);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -465,14 +527,18 @@ PHP_FUNCTION(mysqli_disable_reads_from_master)
 */
 PHP_FUNCTION(mysqli_disable_rpl_parse)
 {
-	MYSQL	*mysql;
-	zval    *mysql_link;
+	MYSQL		*mysql;
+	zval    	*mysql_link;
+	PR_MYSQL	*prmysql;
+	PR_COMMAND	*prcommand;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
 	mysql_disable_rpl_parse(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNSTRING(prcommand, NULL);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -481,15 +547,22 @@ PHP_FUNCTION(mysqli_disable_rpl_parse)
 */
 PHP_FUNCTION(mysqli_dump_debug_info)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
+	PR_COMMAND	*prcommand;
+	ulong		rc;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
+
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
+	rc = mysql_dump_debug_info(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
 
-	if (mysql_dump_debug_info(mysql)) {
+	if (rc) {
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;	
@@ -500,15 +573,19 @@ PHP_FUNCTION(mysqli_dump_debug_info)
 */
 PHP_FUNCTION(mysqli_enable_reads_from_master)
 {
-	MYSQL	*mysql;
-	zval  *mysql_link;
+	MYSQL		*mysql;
+	zval		*mysql_link;
+	PR_MYSQL	*prmysql;
+	PR_COMMAND	*prcommand;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
 	mysql_enable_reads_from_master(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNSTRING(prcommand, NULL);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -517,15 +594,19 @@ PHP_FUNCTION(mysqli_enable_reads_from_master)
 */
 PHP_FUNCTION(mysqli_enable_rpl_parse)
 {
-	MYSQL	*mysql;
-	zval	*mysql_link;
+	MYSQL		*mysql;
+	zval		*mysql_link;
+	PR_MYSQL	*prmysql;
+	PR_COMMAND	*prcommand;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prmysql);
 	mysql_enable_rpl_parse(mysql);
+	MYSQLI_PROFILER_COMMAND_RETURNSTRING(prcommand, NULL);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -534,13 +615,14 @@ PHP_FUNCTION(mysqli_enable_rpl_parse)
 */
 PHP_FUNCTION(mysqli_errno)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 	RETURN_LONG(mysql_errno(mysql));
 }
 /* }}} */
@@ -549,13 +631,14 @@ PHP_FUNCTION(mysqli_errno)
 */
 PHP_FUNCTION(mysqli_error) 
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 	RETURN_STRING((char *)mysql_error(mysql),1);
 }
 /* }}} */
@@ -564,14 +647,15 @@ PHP_FUNCTION(mysqli_error)
 */
 PHP_FUNCTION(mysqli_execute)
 {
-	STMT *stmt;
-	zval *mysql_stmt;
-	unsigned int i;
+	STMT 			*stmt;
+	zval 			*mysql_stmt;
+	unsigned int 	i;
+	PR_STMT			*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 	
 	if (stmt->type == FETCH_SIMPLE) {
 		for (i = 0; i < stmt->var_cnt; i++) {		
@@ -607,15 +691,16 @@ PHP_FUNCTION(mysqli_execute)
 */
 PHP_FUNCTION(mysqli_fetch)
 {
-	STMT *stmt;
-	zval *mysql_stmt;
-	unsigned int i;
-	ulong ret;
+	STMT 			*stmt;
+	zval 			*mysql_stmt;
+	unsigned int 	i;
+	ulong 			ret;
+	PR_STMT			*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 	
 	/* reset buffers */
 
@@ -676,15 +761,16 @@ PHP_FUNCTION(mysqli_fetch)
 */
 PHP_FUNCTION(mysqli_fetch_field) 
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
+	MYSQL_RES 	*result;
+	zval  		*mysql_result;
 	MYSQL_FIELD *field;
+	PR_RESULT 	*prresult;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
 		return;
 	}
 
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 	if (!(field = mysql_fetch_field(result))) {
 		RETURN_FALSE;
@@ -708,10 +794,11 @@ PHP_FUNCTION(mysqli_fetch_field)
 */
 PHP_FUNCTION(mysqli_fetch_fields) 
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
-	MYSQL_FIELD *field;
-	zval *obj;
+	MYSQL_RES	*result;
+	zval  		*mysql_result;
+	MYSQL_FIELD	*field;
+	zval 		*obj;
+	PR_RESULT 	*prresult;
 
 	unsigned int i;
 
@@ -719,7 +806,7 @@ PHP_FUNCTION(mysqli_fetch_fields)
 		return;
 	}
 
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 	if (!(field = mysql_fetch_field(result))) {
 		RETURN_FALSE;
@@ -753,16 +840,17 @@ PHP_FUNCTION(mysqli_fetch_fields)
 */
 PHP_FUNCTION(mysqli_fetch_field_direct) 
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
+	MYSQL_RES	*result;
+	zval		*mysql_result;
 	MYSQL_FIELD *field;
-	int offset;
+	int 		offset;
+	PR_RESULT 	*prresult;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
 		return;
 	}
 
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 	if (!(field = mysql_fetch_field_direct(result,offset))) {
 		RETURN_FALSE;
@@ -786,17 +874,18 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
 */
 PHP_FUNCTION(mysqli_fetch_lengths) 
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
-	unsigned int i;
-	unsigned long *ret;
+	MYSQL_RES		*result;
+	zval			*mysql_result;
+	unsigned int	i;
+	unsigned long	*ret;
+	PR_RESULT 		*prresult;
 	
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
 		return;
 	}
 
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 	if (!(ret = mysql_fetch_lengths(result))) {
 		RETURN_FALSE;
@@ -822,13 +911,14 @@ PHP_FUNCTION(mysqli_fetch_row)
 */
 PHP_FUNCTION(mysqli_field_count) 
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_LONG(mysql_field_count(mysql));
 }
@@ -838,14 +928,15 @@ PHP_FUNCTION(mysqli_field_count)
 */
 PHP_FUNCTION(mysqli_field_seek)
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
-	unsigned int fieldnr;
+	MYSQL_RES		*result;
+	zval			*mysql_result;
+	unsigned int	fieldnr;
+	PR_RESULT 		*prresult;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 	if (fieldnr < 0 || fieldnr >= mysql_num_fields(result)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field offset is invalid for resultset");
@@ -861,13 +952,14 @@ PHP_FUNCTION(mysqli_field_seek)
 */
 PHP_FUNCTION(mysqli_field_tell)
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
+	MYSQL_RES	*result;
+	zval		*mysql_result;
+	PR_RESULT 	*prresult;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 	
 	RETURN_LONG(mysql_field_tell(result));
 }
@@ -877,15 +969,19 @@ PHP_FUNCTION(mysqli_field_tell)
 */
 PHP_FUNCTION(mysqli_free_result) 
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
+	MYSQL_RES	*result;
+	zval		*mysql_result;
+	PR_RESULT	*prresult;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
-	mysql_free_result(result);	
+	mysql_free_result(result);
+	if (MyG(profiler)) {
+		prresult->closed = 1;
+	}
 	MYSQLI_CLEAR_RESOURCE(&mysql_result);	
 
 	RETURN_TRUE;
@@ -900,17 +996,18 @@ PHP_FUNCTION(mysqli_get_client_info)
 }
 /* }}} */
 
-/* {{{ proto string mysqli_get_host_info 
+/* {{{ proto string mysqli_get_host_info (resource link) 
 */
 PHP_FUNCTION(mysqli_get_host_info)
 {
-	MYSQL *mysql;
-	zval  *mysql_link = NULL;
+	MYSQL 		*mysql;
+	zval  		*mysql_link = NULL;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_STRING((char *)mysql_get_host_info(mysql), 1);
 }
@@ -920,46 +1017,49 @@ PHP_FUNCTION(mysqli_get_host_info)
 */
 PHP_FUNCTION(mysqli_get_proto_info)
 {
-	MYSQL *mysql;
-	zval  *mysql_link = NULL;
+	MYSQL 		*mysql;
+	zval  		*mysql_link = NULL;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_LONG(mysql_get_proto_info(mysql));
 }
 /* }}} */
 
-/* {{{ proto string mysqli_get_server_info 
+/* {{{ proto string mysqli_get_server_info(resource link) 
 */
 PHP_FUNCTION(mysqli_get_server_info)
 {
-	MYSQL	*mysql;
-	zval  	*mysql_link = NULL;
+	MYSQL		*mysql;
+	zval	  	*mysql_link = NULL;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_STRING((char *)mysql_get_server_info(mysql), 1);
 }
 
 /* }}} */
 
-/* {{{ proto int mysqli_get_server_version 
+/* {{{ proto int mysqli_get_server_version(resource link) 
 */
 PHP_FUNCTION(mysqli_get_server_version)
 {
 	MYSQL	*mysql;
 	zval  	*mysql_link = NULL;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_LONG(mysql_get_server_version(mysql));
 }
@@ -970,14 +1070,15 @@ PHP_FUNCTION(mysqli_get_server_version)
 */
 PHP_FUNCTION(mysqli_info)
 {
-	MYSQL *mysql;
-	char  *info = NULL;
-	zval  *mysql_link = NULL;
+	MYSQL 		*mysql;
+	char  		*info = NULL;
+	zval  		*mysql_link = NULL;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (!(info = (char *)mysql_info(mysql))) {
 		RETURN_FALSE;
@@ -991,8 +1092,9 @@ PHP_FUNCTION(mysqli_info)
    initialize mysqli */
 PHP_FUNCTION(mysqli_init)
 {
-	MYSQL *mysql = mysql_init(NULL);
-	MYSQLI_RETURN_RESOURCE(mysql, mysqli_link_class_entry);	
+	MYSQLI_RESOURCE *mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
+	mysqli_resource->ptr = (void *)mysql_init(NULL);
+	MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);	
 }
 /* }}} */
 
@@ -1001,13 +1103,14 @@ PHP_FUNCTION(mysqli_init)
 PHP_FUNCTION(mysqli_insert_id)
 {
 	MYSQL		 	*mysql;
-	my_ulonglong 		rc;
+	my_ulonglong 	rc;
 	zval  			*mysql_link;
+	PR_MYSQL		*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 	rc = mysql_insert_id(mysql);
 	MYSQLI_RETURN_LONG_LONG(rc)
 }
@@ -1017,14 +1120,15 @@ PHP_FUNCTION(mysqli_insert_id)
 */
 PHP_FUNCTION(mysqli_kill)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
-	int   processid;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	int   		processid;
+	PR_MYSQL	*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_link, mysqli_link_class_entry, &processid) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 	
 	if (mysql_kill(mysql, processid)) {
 		RETURN_FALSE;
@@ -1037,15 +1141,16 @@ PHP_FUNCTION(mysqli_kill)
 /* {{{ proto bool mysqli_master_query(resource link, string query)
 */
 PHP_FUNCTION(mysqli_master_query) {
-	MYSQL	*mysql;
-	zval	*mysql_link;
-	char	*query = NULL;
-	unsigned int query_len;
+	MYSQL			*mysql;
+	zval			*mysql_link;
+	char			*query = NULL;
+	unsigned int 	query_len;
+	PR_MYSQL		*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (mysql_master_query(mysql, query, query_len)) {
 		RETURN_FALSE;
@@ -1058,13 +1163,14 @@ PHP_FUNCTION(mysqli_master_query) {
 */
 PHP_FUNCTION(mysqli_num_fields)
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
+	MYSQL_RES	*result;
+	zval		*mysql_result;
+	PR_RESULT	*prresult;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 
 	RETURN_LONG(mysql_num_fields(result));
@@ -1075,20 +1181,26 @@ PHP_FUNCTION(mysqli_num_fields)
 */
 PHP_FUNCTION(mysqli_num_rows)
 {
-	MYSQL_RES *result;
-	zval  *mysql_result;
+	MYSQL_RES	*result;
+	zval		*mysql_result;
+	PR_RESULT	*prresult;
+	PR_COMMAND	*prcommand;
+	ulong		rc;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result"); 
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
 
 	if (result->handle && result->handle->status == MYSQL_STATUS_USE_RESULT) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function cannot be used with MYSQL_USE_RESULT");
 		RETURN_LONG(0);
 	}
 
-	RETURN_LONG(mysql_num_rows(result));
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prresult);
+	rc = mysql_num_rows(result);
+	MYSQLI_PROFILER_COMMAND_RETURNLONG(prcommand, rc);
+	RETURN_LONG(rc);
 }
 /* }}} */
 
@@ -1096,17 +1208,18 @@ PHP_FUNCTION(mysqli_num_rows)
    set options */
 PHP_FUNCTION(mysqli_options)
 {
-	MYSQL *mysql;
-	zval  *mysql_link = NULL;
-	zval  *mysql_value;
-	long  mysql_option;
-	unsigned int l_value;
-	long  ret;
+	MYSQL 			*mysql;
+	zval  			*mysql_link = NULL;
+	zval  			*mysql_value;
+	long  			mysql_option;
+	unsigned int 	l_value;
+	long  			ret;
+	PR_MYSQL		*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oslz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	switch (Z_TYPE_PP(&mysql_value)) {
 		case IS_STRING:
@@ -1131,13 +1244,14 @@ PHP_FUNCTION(mysqli_options)
    return the number of parameter for the given statement */
 PHP_FUNCTION(mysqli_param_count)
 {
-	STMT 	*stmt;
-	zval	*mysql_stmt;
+	STMT 		*stmt;
+	zval		*mysql_stmt;
+	PR_STMT		*prstmt;
 	
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 		
 	RETURN_LONG(mysql_param_count(stmt->stmt));
 }
@@ -1147,13 +1261,14 @@ PHP_FUNCTION(mysqli_param_count)
 */
 PHP_FUNCTION(mysqli_ping)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 	RETURN_LONG(mysql_ping(mysql));
 }
 /* }}} */
@@ -1162,27 +1277,54 @@ PHP_FUNCTION(mysqli_ping)
    */
 PHP_FUNCTION(mysqli_prepare)
 {
-	MYSQL		*mysql;
-	STMT 		*stmt;
-	char		*query = NULL;
-	unsigned int query_len;
-	zval		*mysql_link;
+	MYSQL			*mysql;
+	STMT 			*stmt;
+	PR_MYSQL		*prmysql;
+	PR_STMT			*prstmt;
+	char			*query = NULL;
+	unsigned int	query_len;
+	zval			*mysql_link;
+	MYSQLI_RESOURCE *mysqli_resource; 
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os",&mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	stmt = (STMT *)ecalloc(1,sizeof(STMT));
 	stmt->var_cnt = 0;
+
+	/* profiling information */
+	if (MyG(profiler)) {
+		prstmt = (PR_STMT *)MYSQLI_PROFILER_NEW(prmysql, MYSQLI_PR_STMT, 1);
+		prstmt->explain.query = my_estrdup(query);
+		if (!strncasecmp("select", query, 6)){
+			if (!(MYSQLI_PROFILER_EXPLAIN(&prstmt->explain, &prstmt->header, mysql, query))) {
+				RETURN_FALSE;
+			}
+		}
+	}
 	stmt->stmt = mysql_prepare(mysql, query, query_len); 
 
+	if (MyG(profiler)) {
+		MYSQLI_PROFILER_ELAPSEDTIME(prstmt);
+		if (!stmt->stmt) {
+			prstmt->header.error = mysql_errno(mysql);
+			prstmt->header.errormsg = my_estrdup(mysql_error(mysql));
+		} else {
+			prstmt->param_cnt = mysql_param_count(stmt->stmt);
+			prstmt->field_cnt = stmt->stmt->field_count;
+		}
+	}
+
 	if (!stmt->stmt) {
 		efree(stmt);
 		RETURN_FALSE;
 	}
 
-	MYSQLI_RETURN_RESOURCE(stmt, mysqli_stmt_class_entry);
+	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
+	mysqli_resource->ptr = (void *)stmt;
+	MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_stmt_class_entry);
 }
 /* }}} */
 
@@ -1190,14 +1332,15 @@ PHP_FUNCTION(mysqli_prepare)
 */
 PHP_FUNCTION(mysqli_prepare_result)
 {
-	STMT *stmt;
-	MYSQL_RES *result;
-	zval *mysql_stmt;
+	STMT		*stmt;
+	MYSQL_RES	*result;
+	zval 		*mysql_stmt;
+	PR_STMT		*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 	
 	if (!(result = mysql_prepare_result(stmt->stmt))){
 		RETURN_FALSE;
@@ -1211,13 +1354,14 @@ PHP_FUNCTION(mysqli_prepare_result)
 */
 PHP_FUNCTION(mysqli_read_query_result)
 {
-	MYSQL	*mysql;
-	zval 	*mysql_link;
+	MYSQL		*mysql;
+	zval 		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (mysql_read_query_result(mysql)) {
 		RETURN_FALSE;
@@ -1231,11 +1375,12 @@ PHP_FUNCTION(mysqli_read_query_result)
    open a connection to a mysql server */ 
 PHP_FUNCTION(mysqli_real_connect)
 {
-	MYSQL *mysql;
-	char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
+	MYSQL 		*mysql;
+	char 		*hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL;
 	unsigned int hostname_len, username_len, passwd_len, dbname_len, socket_len;
 	unsigned int port=0, flags=0;
-	zval *mysql_link;
+	zval 		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|sssslsl", &mysql_link, mysqli_link_class_entry,
 		&hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, &dbname, &dbname_len, &port, &socket, &socket_len,
@@ -1261,7 +1406,7 @@ PHP_FUNCTION(mysqli_real_connect)
 		}
 	}	
 
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (mysql_real_connect(mysql,hostname,username,passwd,dbname,port,socket,flags) == NULL) {
 		/* Save error messages */
@@ -1278,15 +1423,16 @@ PHP_FUNCTION(mysqli_real_connect)
 */
 PHP_FUNCTION(mysqli_real_query)
 {
-	MYSQL	*mysql;
-	zval	*mysql_link;
-	char	*query = NULL;
-	unsigned int query_len;
+	MYSQL			*mysql;
+	zval			*mysql_link;
+	char			*query = NULL;
+	unsigned int 	query_len;
+	PR_MYSQL		*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (mysql_real_query(mysql, query, query_len)) {
 		RETURN_FALSE;
@@ -1298,15 +1444,16 @@ PHP_FUNCTION(mysqli_real_query)
 /* {{{ proto string mysqli_real_escape_string(resource link, string escapestr) 
    close statement */
 PHP_FUNCTION(mysqli_real_escape_string) {
-	MYSQL 	*mysql;
-	zval	*mysql_link = NULL;
-	char	*escapestr, *newstr;
-	int	escapestr_len, newstr_len;
+	MYSQL 		*mysql;
+	zval		*mysql_link = NULL;
+	char		*escapestr, *newstr;
+	int			escapestr_len, newstr_len;
+	PR_MYSQL	*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &escapestr, &escapestr_len) == FAILURE) {
 		return;
 	}	
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	newstr = emalloc(2 * escapestr_len + 1);
 	newstr_len = mysql_real_escape_string(mysql, newstr, escapestr, escapestr_len);
@@ -1320,13 +1467,14 @@ PHP_FUNCTION(mysqli_real_escape_string) {
 */
 PHP_FUNCTION(mysqli_reload)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_BOOL(!mysql_reload(mysql));
 }
@@ -1336,13 +1484,14 @@ PHP_FUNCTION(mysqli_reload)
 */
 PHP_FUNCTION(mysqli_rollback)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_BOOL(mysql_rollback(mysql));
 }
@@ -1352,13 +1501,14 @@ PHP_FUNCTION(mysqli_rollback)
 */
 PHP_FUNCTION(mysqli_rpl_parse_enabled)
 {
-	MYSQL	*mysql;
-	zval  *mysql_link;
+	MYSQL		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_LONG(mysql_rpl_parse_enabled(mysql));
 }
@@ -1368,13 +1518,14 @@ PHP_FUNCTION(mysqli_rpl_parse_enabled)
 */
 PHP_FUNCTION(mysqli_rpl_probe)
 {
-	MYSQL	*mysql;
-	zval  *mysql_link;
+	MYSQL		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 
 	if (mysql_rpl_probe(mysql)) {
@@ -1388,15 +1539,16 @@ PHP_FUNCTION(mysqli_rpl_probe)
 */
 PHP_FUNCTION(mysqli_rpl_query_type)
 {
-	MYSQL	*mysql;
-	zval	*mysql_link;
-	char	*query;
-	int	 query_len;
+	MYSQL		*mysql;
+	zval		*mysql_link;
+	char		*query;
+	int	 		query_len;
+	PR_MYSQL	*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_LONG(mysql_rpl_query_type(query, query_len));
 }
@@ -1406,8 +1558,9 @@ PHP_FUNCTION(mysqli_rpl_query_type)
 */
 PHP_FUNCTION(mysqli_send_long_data)
 {
-	STMT *stmt;
-	zval  *mysql_stmt;
+	STMT 	*stmt;
+	zval  	*mysql_stmt;
+	PR_STMT	*prstmt;
 	char  *data;
 	long  param_nr, data_len;
 
@@ -1415,7 +1568,7 @@ PHP_FUNCTION(mysqli_send_long_data)
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &mysql_stmt, mysqli_stmt_class_entry, &param_nr, &data, &data_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 
 	if (!param_nr) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter number");
@@ -1434,15 +1587,16 @@ PHP_FUNCTION(mysqli_send_long_data)
 */
 PHP_FUNCTION(mysqli_send_query)
 {
-	MYSQL	*mysql;
-	zval	*mysql_link;
-	char	*query = NULL;
-	unsigned int query_len;
+	MYSQL			*mysql;
+	zval			*mysql_link;
+	char			*query = NULL;
+	unsigned int 	query_len;
+	PR_MYSQL		*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (mysql_send_query(mysql, query, query_len)) {
 		RETURN_FALSE;
@@ -1455,15 +1609,16 @@ PHP_FUNCTION(mysqli_send_query)
 */
 PHP_FUNCTION(mysqli_slave_query)
 {
-	MYSQL	*mysql;
-	zval	*mysql_link;
-	char	*query = NULL;
-	unsigned int query_len;
+	MYSQL			*mysql;
+	zval			*mysql_link;
+	char			*query = NULL;
+	unsigned int	query_len;
+	PR_MYSQL		*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (mysql_slave_query(mysql, query, query_len)) {
 		RETURN_FALSE;
@@ -1472,38 +1627,19 @@ PHP_FUNCTION(mysqli_slave_query)
 }
 /* }}} */
 
-/* {{{ proto resource mysqli_store_result(resource link)
-*/
-PHP_FUNCTION(mysqli_store_result)
-{
-	MYSQL *mysql;
-	MYSQL_RES *result;
-	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 (!(result = mysql_store_result(mysql))) {
-		RETURN_FALSE;
-	}
-	MYSQLI_RETURN_RESOURCE(result, mysqli_result_class_entry);	
-}
-/* }}} */
-
 /* {{{ proto mixed mysqli_stmt_affected_rows(object stmt)
 */
 PHP_FUNCTION(mysqli_stmt_affected_rows)
 {
 	STMT 			*stmt;
 	zval    		*mysql_stmt;
-	my_ulonglong		rc;
+	my_ulonglong	rc;
+	PR_STMT			*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt");
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt");
 
 	rc = mysql_stmt_affected_rows(stmt->stmt);
 	MYSQLI_RETURN_LONG_LONG(rc)
@@ -1514,13 +1650,14 @@ PHP_FUNCTION(mysqli_stmt_affected_rows)
    close statement */
 PHP_FUNCTION(mysqli_stmt_close)
 {
-	STMT 	*stmt;
-	zval    *mysql_stmt;
+	STMT 		*stmt;
+	zval    	*mysql_stmt;
+	PR_STMT		*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 	mysql_stmt_close(stmt->stmt);
 	stmt->stmt = NULL;
 	php_clear_stmt_bind(stmt); 
@@ -1534,16 +1671,17 @@ PHP_FUNCTION(mysqli_stmt_close)
 */
 PHP_FUNCTION(mysqli_select_db) 
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
-	char  *dbname;
-	int   dbname_len;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	char  		*dbname;
+	int   		dbname_len;
+	PR_MYSQL	*prmysql;
 
 //	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,  "Os", &mysql_link, mysqli_link_class_entry, &dbname, &dbname_len) == FAILURE) {
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &dbname, &dbname_len) == FAILURE) {
 		return;
 	} 
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 	
 	if (!mysql_select_db(mysql, dbname)) {
 		RETURN_TRUE;
@@ -1557,16 +1695,17 @@ PHP_FUNCTION(mysqli_select_db)
 */
 PHP_FUNCTION(mysqli_ssl_set)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
-	char  *key=NULL, *cert=NULL, *ca=NULL, *capath=NULL, *cipher=NULL;
-	int   key_len, cert_len, ca_len, capath_len, cipher_len;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	char  		*key=NULL, *cert=NULL, *ca=NULL, *capath=NULL, *cipher=NULL;
+	int   		key_len, cert_len, ca_len, capath_len, cipher_len;
+	PR_MYSQL	*prmysql;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osssss", &mysql_link, mysqli_link_class_entry, 
 		&key, &key_len, &cert, &cert_len, &ca, &ca_len, &capath, &capath_len, &cipher, &cipher_len) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 	
 	mysql_ssl_set(mysql, key, cert, ca, capath, cipher);
 
@@ -1578,13 +1717,14 @@ PHP_FUNCTION(mysqli_ssl_set)
 */
 PHP_FUNCTION(mysqli_stat)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_STRING((char *)mysql_stat(mysql), 1);
 }
@@ -1595,13 +1735,14 @@ PHP_FUNCTION(mysqli_stat)
 */
 PHP_FUNCTION(mysqli_stmt_errno)
 {
-	STMT *stmt;
-	zval *mysql_stmt;
+	STMT 	*stmt;
+	zval 	*mysql_stmt;
+	PR_STMT	*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 
 	RETURN_LONG(mysql_stmt_errno(stmt->stmt));
 }
@@ -1611,13 +1752,14 @@ PHP_FUNCTION(mysqli_stmt_errno)
 */
 PHP_FUNCTION(mysqli_stmt_error) 
 {
-	STMT *stmt;
-	zval *mysql_stmt;
+	STMT 	*stmt;
+	zval 	*mysql_stmt;
+	PR_STMT	*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 	
 	RETURN_STRING((char *)mysql_stmt_error(stmt->stmt),1);
 }
@@ -1627,13 +1769,14 @@ PHP_FUNCTION(mysqli_stmt_error)
 */
 PHP_FUNCTION(mysqli_stmt_store_result)
 {
-	STMT *stmt;
-	zval *mysql_stmt;
+	STMT 	*stmt;
+	zval 	*mysql_stmt;
+	PR_STMT	*prstmt;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
 		return;
 	}
-	MYSQLI_FETCH_RESOURCE(stmt, STMT *, &mysql_stmt, "mysqli_stmt"); 
+	MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt, "mysqli_stmt"); 
 	
 	if (mysql_stmt_store_result(stmt->stmt)){
 		RETURN_FALSE;
@@ -1641,18 +1784,44 @@ PHP_FUNCTION(mysqli_stmt_store_result)
 	RETURN_TRUE;
 }
 /* }}} */
+
+/* {{{ proto resource mysqli_store_result(resource link)
+*/
+PHP_FUNCTION(mysqli_store_result)
+{
+	MYSQL 			*mysql;
+	MYSQL_RES 		*result;
+	zval  			*mysql_link;
+	PR_MYSQL		*prmysql;
+	MYSQLI_RESOURCE	*mysqli_resource;
+
+	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 *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
+
+	if (!(result = mysql_store_result(mysql))) {
+		RETURN_FALSE;
+	}
+	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
+	mysqli_resource->ptr = (void *)result;
+	MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);	
+}
+/* }}} */
+
 /* {{{ proto int mysqli_thread_id(resource link)
 */
 
 PHP_FUNCTION(mysqli_thread_id)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_LONG(mysql_thread_id(mysql));
 }
@@ -1671,19 +1840,23 @@ PHP_FUNCTION(mysqli_thread_safe)
 */
 PHP_FUNCTION(mysqli_use_result)
 {
-	MYSQL *mysql;
-	MYSQL_RES *result;
-	zval  *mysql_link;
+	MYSQL 			*mysql;
+	MYSQL_RES 		*result;
+	zval  			*mysql_link;
+	PR_MYSQL		*prmysql;
+	MYSQLI_RESOURCE *mysqli_resource;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	if (!(result = mysql_use_result(mysql))) {
 		RETURN_FALSE;
 	}
-	MYSQLI_RETURN_RESOURCE(result, mysqli_result_class_entry);	
+	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
+	mysqli_resource->ptr = (void *)result;
+	MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);	
 }
 /* }}} */
 
@@ -1691,13 +1864,14 @@ PHP_FUNCTION(mysqli_use_result)
 */
 PHP_FUNCTION(mysqli_warning_count)
 {
-	MYSQL *mysql;
-	zval  *mysql_link;
+	MYSQL 		*mysql;
+	zval  		*mysql_link;
+	PR_MYSQL	*prmysql;
 
 	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"); 
+	MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, prmysql, PR_MYSQL *, &mysql_link, "mysqli_link");
 
 	RETURN_LONG(mysql_warning_count(mysql));
 }