Fix bug #61003 mysql_stat() require a valid connection

diff --git a/NEWS b/NEWS
index 11ad4f6308dc4ad9ce6d0b25da5c2b193c47aae2..50c6da336030343fd13d932d3ad2a45a62b9808d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,9 @@ PHP                                                                        NEWS
 - Firebird Database extension (ibase):
   . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
 
+- mysqli
+  . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
+
 - PDO_mysql
   . Fixed bug #61207 (PDO::nextRowset() after a multi-statement query doesn't
     always work). (Johannes)

diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index 2d29ccba8bdb7b56c84d087bff614423e929f97b..a9155702a64d03edd077a0f68069b29fa39f04b4 100644 (file)
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -211,7 +211,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;