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/pdo_mysql.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/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 d9c04470a4..87ff61f6de 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", (zend_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); |