Merge branch 'PHP-5.3' into PHP-5.4

diff --cc ext/mysqlnd/mysqlnd.c
index 9e40846b6d7dde60f5d05380d26ff0bcbc99f19c,20bab915e2e2a359b7e4b4b73ab0b870bb2e3d49..3483d8692a4488a69374e39a3cd21ed9e183faf0
--- 1/ext/mysqlnd/mysqlnd.c
--- 2/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;
        }