From 1d0b5d303b773bdc70c264aedb1bce9d74155451 Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Thu, 12 Jul 2007 20:31:18 +0000
Subject: [PATCH] More typical changes:

1) Try to have portable SQL, don't create your own schema unless the test
   wants to test exactly this
2) Don't rely on default SQL sort orders
3) Use proper UEXPECTF. There have been a lot of tiny unicode issues when
   ext/mysqli has returned a binary string in unicode mode although a
   unicode string could be expected and vice versa
---
 ext/mysqli/tests/002.phpt | 67 +++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index 49145bb33e..5a9630bc2f 100644
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -7,23 +7,28 @@ mysqli bind_result 1
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd);
-    $link->query("CREATE SCHEMA test");
-
-	mysqli_select_db($link, "test");		
-	$rc = mysqli_query($link,"DROP TABLE IF EXISTS test_fetch_null");
-
-  	$rc = mysqli_query($link,"CREATE TABLE test_fetch_null(col1 tinyint, col2 smallint,
-                                                       col3 int, col4 bigint, 
-                                                       col5 float, col6 double,
-                                                       col7 date, col8 time, 
-                                                       col9 varbinary(10), 
-                                                       col10 varchar(50),
-                                                       col11 char(20))");
+	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	   printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());	
+
+	if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))
+		printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	$rc = mysqli_query($link,"CREATE TABLE test_fetch_null(col1 tinyint, col2 smallint,
+														col3 int, col4 bigint, 
+														col5 float, col6 double,
+														col7 date, col8 time, 
+														col9 varbinary(10), 
+														col10 varchar(50),
+														col11 char(20)) ENGINE=" . $engine);
+
+	if (!$rc)
+		printf("[003] Cannot create table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
   
-	$rc = mysqli_query($link,"INSERT INTO test_fetch_null(col1,col10, col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
+	$rc = mysqli_query($link, "INSERT INTO test_fetch_null(col1,col10, col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
+	if (!$rc)
+		printf("[004] Cannot insert records, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-	$stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from test_fetch_null");
+	$stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from test_fetch_null ORDER BY col1");
 	mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11); 
 	mysqli_execute($stmt);
 
@@ -35,6 +40,7 @@ mysqli bind_result 1
 
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 array(11) {
@@ -57,7 +63,34 @@ array(11) {
   [8]=>
   NULL
   [9]=>
-  %s(4) "foo1"
+  string(4) "foo1"
+  [10]=>
+  string(4) "1000"
+}
+done!
+--UEXPECTF--
+array(11) {
+  [0]=>
+  int(1)
+  [1]=>
+  NULL
+  [2]=>
+  NULL
+  [3]=>
+  NULL
+  [4]=>
+  NULL
+  [5]=>
+  NULL
+  [6]=>
+  NULL
+  [7]=>
+  NULL
+  [8]=>
+  NULL
+  [9]=>
+  unicode(4) "foo1"
   [10]=>
-  %s(4) "1000"
+  unicode(4) "1000"
 }
+done!
-- 
2.40.0