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/pdo_mysql.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/pdo_mysql.c')
| -rw-r--r-- | ext/pdo_mysql/pdo_mysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 6f4e9d5265..50da0ba783 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -126,7 +126,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql) #if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND) REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY); #endif - + REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (zend_long)PDO_MYSQL_ATTR_MULTI_STATEMENTS); #ifdef PDO_USE_MYSQLND mysqlnd_reverse_api_register_api(&pdo_mysql_reverse_api TSRMLS_CC); |