update

diff --git a/NEWS b/NEWS
index 00a2dd67ead3d11a20e5ea67bef8aa26ed674027..41ab1bb7f0de2b42d86d12b6b7a48ca83f9a927a 100644 (file)
--- 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 bc5773cfa89f8ce7edc11a8a8311c6d9a37f1652..0e497f743db939a03c6f4e94407c5cd04cdb61dd 100755 (executable)
--- 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.
 
 
 ========================================