fixed bug #29577 (MYSQLI_CLIENT_FOUND_ROWS undefined)

diff --git a/NEWS b/NEWS
index 1cff51a445d969fbe635a470bd8a5ecfd134ee11..010b29a6dde1b70fd38e2df4a08a696aec8bd1fb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,8 +4,10 @@ PHP                                                                        NEWS
 - Updated several libraries bundled with the windows release which now 
   includes libxml2-2.6.11, libxslt-1.1.7 and iconv-1.9.1. (Rob, Edin)
 - Improved and moved ActiveScript SAPI to PECL.  (Wez)
+- Fixed bug #29577 (MYSQLI_CLIENT_FOUND_ROWS undefined) (Georg)
 - Fixed bug #29573 (Segmentation fault, when exception thrown within
   PHP function called from XSLT). (Christian)
+- Fixed bug #29522 (accessing properties without connection) (Georg)
 - Fixed bug #29505 (get_class_vars() severely broken when used with arrays).
   (Marcus)
 - Fixed bug #29490 (.Net object instantiation failed). (Michael Sisolak).

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 10edca186b9f35ece45ea080261908b2ef0fa791..ea3e116379bcf020dac6e873e32fdba421b246d5 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -438,6 +438,7 @@ PHP_MINIT_FUNCTION(mysqli)
        REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_NO_SCHEMA", CLIENT_NO_SCHEMA, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_FOUND_ROWS", CLIENT_FOUND_ROWS, CONST_CS | CONST_PERSISTENT);
 
        /* for mysqli_query */
        REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT", 0, CONST_CS | CONST_PERSISTENT);