--- embedaddon/php/ext/mysqli/mysqli_mysqlnd.h	2012/02/21 23:47:58	1.1.1.1
+++ embedaddon/php/ext/mysqli/mysqli_mysqlnd.h	2012/05/29 12:34:41	1.1.1.2
@@ -32,7 +32,7 @@
 
 #define mysqli_result_is_unbuffered(r)	((r)->unbuf)
 #define mysqli_result_is_unbuffered_and_not_everything_is_fetched(r)	((r)->unbuf && !(r)->unbuf->eof_reached)
-#define mysqli_server_status(c)			(c)->upsert_status.server_status
+#define mysqli_server_status(c)			mysqlnd_get_server_status((c))
 #define mysqli_stmt_get_id(s)			((s)->data->stmt_id)
 #define mysqli_stmt_warning_count(s)	mysqlnd_stmt_warning_count((s))
 #define mysqli_stmt_server_status(s)	mysqlnd_stmt_server_status((s))
@@ -41,7 +41,7 @@
 #define mysqli_stmt_close(c, implicit)	mysqlnd_stmt_close((c), (implicit))
 #define mysqli_free_result(r, implicit)	mysqlnd_free_result((r), (implicit))
 #define mysqli_async_query(c, q, l)		mysqlnd_async_query((c), (q), (l))
-#define mysqli_change_user_silent(c, u, p, d)   mysqlnd_change_user((c), (u), (p), (d), TRUE)
+#define mysqli_change_user_silent(c, u, p, d, p_len)   mysqlnd_change_user_ex((c), (u), (p), (d), TRUE, (size_t)(p_len))
 
 #define HAVE_STMT_NEXT_RESULT