com php-src: fix compilation error after merge: ext/mysqlnd/mysqlnd.c
| From: | Andrey Hristov | Date: | Wed, 09 Jan 2013 17:39:59 +0000 |
| Subject: | com php-src: fix compilation error after merge: ext/mysqlnd/mysqlnd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70902@lists.php.net to get a copy of this message | ||
Commit: bcd278ad7f3a8e549a3281600decd897dd7d73ce
Author: Andrey Hristov <andrey@php.net> Wed, 9 Jan 2013 18:39:59 +0100
Parents: 6a6ec195acb0a67b8728dd32fad5c82b37b31192
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd278ad7f3a8e549a3281600decd897dd7d73ce
Log:
fix compilation error after merge
Changed paths:
M ext/mysqlnd/mysqlnd.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 3483d86...db0a111 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -774,7 +774,7 @@ 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() */
+ mysql_flags |= conn->options->flags; /* use the flags from set_client_option() */
if (db) {
mysql_flags |= CLIENT_CONNECT_WITH_DB;