Merge branch 'PHP-5.3' into PHP-5.4

faizshukri · faizshukri · commit 6a6ec195acb0 · 2013-01-09T18:27:50.000+01:00
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
@@ -774,6 +774,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
 	/* 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 (db) {
 		mysql_flags |= CLIENT_CONNECT_WITH_DB;
 	}

Original file line number	Diff line number	Diff line change
`@@ -774,6 +774,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,`
`774`	`774`	`/* we allow load data local infile by default */`
`775`	`775`	`mysql_flags \|= MYSQLND_CAPABILITIES;`
`776`	`776`
	`777`	`+ mysql_flags \|= conn->options.flags; /* use the flags from set_client_option() */`
	`778`	`+`
`777`	`779`	`if (db) {`
`778`	`780`	`mysql_flags \|= CLIENT_CONNECT_WITH_DB;`
`779`	`781`	`}`