summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2015-02-03 22:04:24 +0800
committerXinchen Hui <laruence@gmail.com>2015-02-03 22:04:24 +0800
commitd4546601f3e04990c36f5d2b6794944739c26c8c (patch)
tree4a9548a90cf8f1aae5582cfd5e185626407478f7
parent0d4255de30314dbfa32827e044b35543b1ae5a39 (diff)
downloadphp-git-d4546601f3e04990c36f5d2b6794944739c26c8c.tar.gz
Fixed mysql tests fails
-rw-r--r--ext/mysql/php_mysql.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index f593e184e1..02852566ab 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1113,6 +1113,10 @@ PHP_FUNCTION(mysql_close)
RETURN_FALSE;
}
} else {
+ if (!MySG(default_link)) {
+ zend_fetch_resource2_ex(NULL, "MySQL-Link", le_link, le_plink); /* trigger a warning to be consistent */
+ RETURN_FALSE;
+ }
if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(MySG(default_link), "MySQL-Link", le_link, le_plink))) {
RETURN_FALSE;
}