Fix bug #61003 mysql_stat() require a valid connection

diff --git a/NEWS b/NEWS
index b0e9be5b0551a880cf1b38fe032419d320807551..168931cfefbb45c25b567c2e42c0c60c12d74d11 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,9 @@ PHP                                                                        NEWS
 - mbstring:
   . MFH mb_ereg_replace_callback() for security enhancements. (Rui)
 
+- mysqli
+  . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
+
 - mysqlnd
   . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
     (Johannes)

diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index 7e1bc9f7ec8d58c59edd9d219bfcda8d33d83505..908de63d234eb375d9238e20f45f9a475d2bb7bf 100644 (file)
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -260,7 +260,11 @@ static int link_stat_read(mysqli_object *obj, zval **retval TSRMLS_DC)\
        MAKE_STD_ZVAL(*retval);
        ZVAL_NULL(*retval);
 
+#if defined(MYSQLI_USE_MYSQLND)
        CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+#else
+       CHECK_STATUS(MYSQLI_STATUS_VALID);
+#endif
 
        mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;