From: Andrey Hristov <andrey@php.net>
Date: Wed, 9 Jan 2013 17:27:50 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha4~31^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a6ec195acb0a67b8728dd32fad5c82b37b31192;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

6a6ec195acb0a67b8728dd32fad5c82b37b31192
diff --cc ext/mysqlnd/mysqlnd.c
index 9e40846b6d,20bab915e2..3483d8692a
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@@ -772,8 -688,11 +772,10 @@@ MYSQLND_METHOD(mysqlnd_conn_data, conne
  		goto err;
  	}
  	/* we allow load data local infile by default */
 -	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;
  	}