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/php_pdo_mysql_int.h | |
| 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/php_pdo_mysql_int.h')
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index f6cdb0a8f2..c9e091f414 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -172,8 +172,9 @@ enum { PDO_MYSQL_ATTR_SSL_CAPATH, PDO_MYSQL_ATTR_SSL_CIPHER, #if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND) - PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY + PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, #endif + PDO_MYSQL_ATTR_MULTI_STATEMENTS, }; #endif |