diff options
| author | Julien Pauli <jpauli@php.net> | 2014-12-05 17:05:37 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-12-05 17:05:37 +0100 |
| commit | 5104c2bbc3cff9fd18e61a107166eba6ab356bba (patch) | |
| tree | fe3e373d2cabfe172e3a7648f528e2d275c6e78e /ext/pdo_mysql/mysql_driver.c | |
| parent | a3e4b889e7e6f025dd637a1c7c76a8a08fba7d4b (diff) | |
| parent | 3add3491b3c0d48aa5278163664e5dc66c024419 (diff) | |
| download | php-git-5104c2bbc3cff9fd18e61a107166eba6ab356bba.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 581766b38a..d0a2fc3abd 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -551,10 +551,14 @@ 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 + 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 - ; #if defined(PDO_USE_MYSQLND) int dbname_len = 0; |