From 408d0a0420e2ccc3a1a3aec670dabdf9964da37e Mon Sep 17 00:00:00 2001
From: Pierre Joye <pajoye@php.net>
Date: Sun, 21 Aug 2011 14:31:11 +0000
Subject: [PATCH] - merge two mysqli section

---
 NEWS | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 0c3f22cc40..c9032d09e4 100644
--- a/NEWS
+++ b/NEWS
@@ -169,10 +169,6 @@ PHP                                                                        NEWS
   . Fixed bug #55169 (mcrypt_create_iv always fails to gather sufficient random 
     data on Windows). (Pierre)
 
-- MySQL Improved extension:
-  . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries).
-    (Andrey)
-
 - mysqlnd
   . Fixed crash when using more than 28,000 bound parameters. Workaround is to
     set mysqlnd.net_cmd_buffer_size to at least 9000. (Andrey)
@@ -182,6 +178,8 @@ PHP                                                                        NEWS
 - MySQLi extension:
   . Fixed bug #55283 (SSL options set by mysqli_ssl_set ignored for MySQLi
     persistent connections). (Andrey)
+  . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries).
+    (Andrey)
 
 - OpenSSL extension:
   . openssl_encrypt()/openssl_decrypt() truncated keys of variable length
-- 
2.40.0