diff options
| author | Ondřej Surý <ondrej@sury.org> | 2015-01-26 11:52:53 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2015-01-26 11:52:53 +0100 |
| commit | 832b62efb8fceebb220116d8024d945a9bd31d7e (patch) | |
| tree | e3c65d02b50180c7d7d7c21626d403d2eb87793a /ext/pdo_mysql/mysql_driver.c | |
| parent | 60fede4c90746ef3408ed27a15dd405b3a46a83b (diff) | |
| download | php-upstream/5.6.5+dfsg.tar.gz | |
New upstream version 5.6.5+dfsgupstream/5.6.5+dfsg
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 581766b38..33096bb15 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; @@ -551,15 +552,20 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ #ifdef CLIENT_MULTI_RESULTS |CLIENT_MULTI_RESULTS #endif -#ifdef CLIENT_MULTI_STATEMENTS - |CLIENT_MULTI_STATEMENTS -#endif ; - #if defined(PDO_USE_MYSQLND) int dbname_len = 0; int password_len = 0; #endif + +#ifdef CLIENT_MULTI_STATEMENTS + if (!driver_options) { + connect_opts |= CLIENT_MULTI_STATEMENTS; + } else if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_MULTI_STATEMENTS, 1 TSRMLS_CC)) { + connect_opts |= CLIENT_MULTI_STATEMENTS; + } +#endif + PDO_DBG_ENTER("pdo_mysql_handle_factory"); PDO_DBG_INF_FMT("dbh=%p", dbh); #ifdef CLIENT_MULTI_RESULTS |