From 80ec77df04f0f1be830da4e17e7a5d970469f42a Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Thu, 1 Sep 2011 11:48:18 +0000
Subject: [PATCH] Simplify mysqlnd debug trace marginally for debugging

---
 .../tests/mysqli_stmt_execute_stored_proc_next_result.phpt  | 6 +++++-
 ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
index 1f92ca1f88..1469f65801 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
@@ -15,7 +15,11 @@ if (mysqli_get_server_version($link) < 50503) {
 --FILE--
 <?php
 	require_once('connect.inc');
-	require_once('table.inc');
+
+	if (!$link = my_mysqli_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);
+	}
 
 	if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
 		printf("[003] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
index c6053bcae8..bd3592264c 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
@@ -20,7 +20,11 @@ if ($IS_MYSQLND) {
 --FILE--
 <?php
 	require_once('connect.inc');
-	require_once('table.inc');
+
+	if (!$link = my_mysqli_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);
+	}
 
 	if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
 		printf("[003] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
-- 
2.40.0