From 512fdb4cc2424dd576922f3fb330b32468006c48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Tue, 6 Mar 2012 00:15:40 +0000 Subject: [PATCH] Fix bug #61003 mysql_stat() require a valid connection --- NEWS | 3 +++ ext/mysqli/mysqli_prop.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 11ad4f6308..50c6da3360 100644 --- 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 2d29ccba8b..a9155702a6 100644 --- 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; -- 2.40.0