diff options
| author | Julien Pauli <jpauli@php.net> | 2014-12-05 17:06:33 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-12-05 17:06:33 +0100 |
| commit | 5a528076d2fcadfc832a6b2fd1a8955e1ff73ef9 (patch) | |
| tree | f020145b761b18088e7cc63d8b6bfd15d6e66de6 /ext/pdo_mysql/mysql_driver.c | |
| parent | 8ab9396adfd2d43bae8ee941827493d545cbfa5d (diff) | |
| parent | 0e67973e9a2707f0010ac9a65020f62b5cb104fb (diff) | |
| download | php-git-5a528076d2fcadfc832a6b2fd1a8955e1ff73ef9.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
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 7e4945a7b8..ab5e4bcfd0 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -556,10 +556,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; |