Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Start adding new attribute to control multi statements
This commit is contained in:
Julien Pauli 2014-12-05 17:06:33 +01:00
commit 5a528076d2
6 changed files with 367 additions and 5 deletions

View file

@ -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