Use during connect the flags set with set_client_option()

faizshukri · faizshukri · commit 12e759c2eaaf · 2013-01-09T18:27:06.000+01:00
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
@@ -691,6 +691,8 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn,
 	mysql_flags |= CLIENT_LOCAL_FILES | CLIENT_PS_MULTI_RESULTS;
 	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
`@@ -691,6 +691,8 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn,`
`691`	`691`	`mysql_flags \|= CLIENT_LOCAL_FILES \| CLIENT_PS_MULTI_RESULTS;`
`692`	`692`	`mysql_flags \|= MYSQLND_CAPABILITIES;`
`693`	`693`
	`694`	`+ mysql_flags \|= conn->options.flags; /* use the flags from set_client_option() */`
	`695`	`+`
`694`	`696`	`if (db) {`
`695`	`697`	`mysql_flags \|= CLIENT_CONNECT_WITH_DB;`
`696`	`698`	`}`