summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2012-10-04 13:40:23 +0200
committerAndrey Hristov <andrey@php.net>2012-10-04 13:40:23 +0200
commit713a3fc58c12fae381c1e2fa81cd70ac05d4e86c (patch)
tree548adc071646890af3b298fa711a6421b98c9d1c
parent61bee020e1fabc7ac8915025bff5e7b773382156 (diff)
downloadphp-git-713a3fc58c12fae381c1e2fa81cd70ac05d4e86c.tar.gz
update
-rw-r--r--NEWS2
-rwxr-xr-xUPGRADING7
2 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 00a2dd67ea..41ab1bb7f0 100644
--- a/NEWS
+++ b/NEWS
@@ -68,6 +68,8 @@ PHP NEWS
- MySQLi
. Dropped support for LOAD DATA LOCAL INFILE handlers when using libmysql.
Known for stability problems. (Andrey)
+ . Added support for SHA256 authentication available with MySQL 5.6.6+. (Andrey)
+
- PCRE:
. Deprecated the /e modifier
diff --git a/UPGRADING b/UPGRADING
index bc5773cfa8..0e497f743d 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -236,11 +236,16 @@ PHP X.Y UPGRADE NOTES
========================================
9. New Global Constants
========================================
-
+- mysqli
+ - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options()
========================================
10. Changes to INI File Handling
========================================
+- mysqlnd
+ - Added mysqlnd.sha256_server_public_key INI PERDIR setting that affects all
+ APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
+ with the new auth protocol, although at coarser level.
========================================