From: Ulf Wendel <uw@php.net>
Date: Wed, 9 Sep 2009 18:31:00 +0000 (+0000)
Subject: Andrey fixed the bug but the test was somewhat borked. Fixing test.
X-Git-Tag: php-5.4.0alpha1~191^2~2675
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=667c5975127e0bf67e5598736f82645f7d66ce5b;p=php

Andrey fixed the bug but the test was somewhat borked. Fixing test.
---

diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt
index 9e5a7554cb..1ef3b6a0ae 100644
--- a/ext/mysqli/tests/bug49027.phpt
+++ b/ext/mysqli/tests/bug49027.phpt
@@ -9,20 +9,54 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include ("connect.inc");
 
-	$link=mysqli_init();
-	if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 1")){
-		echo "Broken 2!\n";
-	}
-	if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 13")){
-		echo "Broken 2!\n";
+	$link = mysqli_init();
+	if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 1")) {
+		printf("[001] Cannot set INIT_COMMAND\n");
 	}
 
-	require('table_real_connect.inc');
+	if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+		printf("[002] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+	}
 
 	var_dump($link->query("SELECT 42")->fetch_row());
+
+	if (!mysqli_query($link, "DROP TABLE IF EXISTS test") ||
+		!mysqli_query($link, sprintf("CREATE TABLE test(id INT) ENGINE=%s", $engine))) {
+		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+
+	mysqli_close($link);
+
+	$link = mysqli_init();
+	if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "INSERT INTO test(id) VALUES(1)")) {
+		printf("[004] Cannot set INIT_COMMAND\n");
+	}
+
+	if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+		printf("[005] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+	}
+
+	if (!$res = mysqli_query($link, "SELECT id FROM test"))
+		printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	var_dump(mysqli_fetch_assoc($res));
+
+	mysqli_free_result($res);
+	mysqli_close($link);
+
+	print "done!";
+?>
+--CLEAN--
+<?php
+	require_once("clean_table.inc");
 ?>
 --EXPECTF--
 array(1) {
   [0]=>
   %unicode|string%(2) "42"
 }
+array(1) {
+  [%u|b%"id"]=>
+  %unicode|string%(1) "1"
+}
+done!