From 16be7ee5c58efa14f3231a373818d850e5594666 Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Mon, 21 Sep 2009 15:24:47 +0000
Subject: [PATCH] Fixing test

---
 ext/mysqli/tests/bug45289.phpt | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/ext/mysqli/tests/bug45289.phpt b/ext/mysqli/tests/bug45289.phpt
index 17d1a3b446..50775b55cc 100644
--- a/ext/mysqli/tests/bug45289.phpt
+++ b/ext/mysqli/tests/bug45289.phpt
@@ -7,29 +7,34 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-	include("connect.inc");
 	require('table.inc');
 
+	$link->close();
+
+	$link = mysqli_init();
+	if (!($link->real_connect($host, $user, $passwd, $db, $port, $socket)))
+		printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+			$host, $user, $db, $port, $socket);
+
 	$id = 1;
 	if (!($stmt = $link->prepare('SELECT id, label FROM test WHERE id=? LIMIT 1')))
-		printf("[001] [%d] %s\n", $link->errno, $link->error);
+		printf("[002] [%d] %s\n", $link->errno, $link->error);
 
 	if (!$stmt->bind_param('i', $id) || !$stmt->execute())
-		printf("[002] [%d] %s\n", $stmt->errno, $stmt->error);
+		printf("[003] [%d] %s\n", $stmt->errno, $stmt->error);
 
 	if ($res = $link->store_result()) {
-		printf("[003] Can store result!\n");
+		if ($IS_MYSQLND)
+			printf("[004] Can store result!\n");
+		else
+			printf("[004] [007] http://bugs.mysql.com/bug.php?id=47485\n");
 	} else {
-		printf("[003] [%d] %s\n", $link->errno, $link->error);
+		printf("[004] [%d] %s\n", $link->errno, $link->error);
 	}
-
-	var_dump($res->fetch_assoc());
 ?>
 --CLEAN--
 <?php
 	require_once("clean_table.inc");
 ?>
 --EXPECTF--
-[003] [0%s
-
-Fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d
+[004] [0%s
-- 
2.50.1