Merge branch 'PHP-5.4' into PHP-5.5

faizshukri · faizshukri · commit cb6071ef5477 · 2013-01-09T18:30:56.000+01:00
Conflicts:
	ext/mysqlnd/mysqlnd.c
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
@@ -708,6 +708,8 @@ 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() */
+
 	if (PG(open_basedir) && strlen(PG(open_basedir))) {
 		mysql_flags ^= CLIENT_LOCAL_FILES;
 	}

Original file line number	Diff line number	Diff line change
`@@ -708,6 +708,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA *`
`708`	`708`	`/* we allow load data local infile by default */`
`709`	`709`	`mysql_flags \|= MYSQLND_CAPABILITIES;`
`710`	`710`
	`711`	`+ mysql_flags \|= conn->options.flags; /* use the flags from set_client_option() */`
	`712`	`+`
`711`	`713`	`if (PG(open_basedir) && strlen(PG(open_basedir))) {`
`712`	`714`	`mysql_flags ^= CLIENT_LOCAL_FILES;`
`713`	`715`	`}`