diff options
| author | Andrey Hristov <andrey@php.net> | 2013-01-09 18:40:57 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-01-09 18:40:57 +0100 |
| commit | 1f7f8429af67cd362ed1dc5ee81bcf518e9d44be (patch) | |
| tree | 4cf4efa6cccdea89c9698090fa9d0015a8adcafe | |
| parent | cb6071ef54779e392cf50831399dfd66939de9a0 (diff) | |
| parent | bcd278ad7f3a8e549a3281600decd897dd7d73ce (diff) | |
| download | php-git-1f7f8429af67cd362ed1dc5ee81bcf518e9d44be.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/mysqlnd/mysqlnd.c
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index db1b9019cc..ebc4a774a6 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -708,7 +708,7 @@ 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() */ + 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; |