From: Ulf Wendel <uw@php.net>
Date: Thu, 1 Sep 2011 11:48:18 +0000 (+0000)
Subject: Simplify mysqlnd debug trace marginally for debugging
X-Git-Tag: php-5.5.0alpha1~1396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=426b388b743b73840432693e20a541dd78bde22b;p=php

Simplify mysqlnd debug trace marginally for debugging
---

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));