Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/mysqlnd/mysqlnd.c

Author: faizshukri

ext/mysqlnd/mysqlnd.c

@@ -708,7 +708,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA *
 	/* we allow load data local infile by default */
 	mysql_flags |= MYSQLND_CAPABILITIES;
 
-	mysql_flags |= conn->options.flags; /* use the flags from set_client_option() */
+	mysql_flags |= conn->options->flags; /* use the flags from set_client_option() */
 
 	if (PG(open_basedir) && strlen(PG(open_basedir))) {
 		mysql_flags ^= CLIENT_LOCAL_FILES;