diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-01-05 10:48:40 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-01-05 10:48:40 +0100 |
| commit | 7d0887a229a28c465781d6e4a00c6df61112bcd5 (patch) | |
| tree | b9b673f96fae9190229cf6d45bc7667e29f314db /ext/pdo_mysql/mysql_driver.c | |
| parent | c234ca8e17a844225a3ce5c64df9fdc5f39e23b9 (diff) | |
| parent | 488d3dac2e7d77223efb3bd4748e14e5b6be0156 (diff) | |
| download | php-git-7d0887a229a28c465781d6e4a00c6df61112bcd5.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 66b70949cb..4f75f02cf1 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -463,6 +463,7 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_ ZVAL_LONG(return_value, H->buffered); break; + case PDO_ATTR_EMULATE_PREPARES: case PDO_MYSQL_ATTR_DIRECT_QUERY: ZVAL_LONG(return_value, H->emulate_prepare); break; |