diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-01-05 09:54:06 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-01-05 10:48:18 +0100 |
| commit | 488d3dac2e7d77223efb3bd4748e14e5b6be0156 (patch) | |
| tree | 14943cb9cc0465d5258fe91daf323461a414773f /ext/pdo_mysql/mysql_driver.c | |
| parent | 95183cc33918efe39098fa4adb3b3b13eaa1eee7 (diff) | |
| parent | 7d2f8525d8ec1612ad3999076e291e734fcb0568 (diff) | |
| download | php-git-488d3dac2e7d77223efb3bd4748e14e5b6be0156.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 296ed4fd4f..33096bb156 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -458,6 +458,7 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_value 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; |