From d5e9a45efdc0edd1ce5bb9741b0c1750e3a23b43 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Tue, 13 Apr 2010 12:41:42 +0200
Subject: [PATCH] Bug #52214 Misleading error msg when test fails before having
 produced any query output Print error message only if real error

---
 client/mysqltest.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 57dcb258221..878de31d4ed 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -610,8 +610,11 @@ public:
 
       if ((bytes= fread(buf, 1, sizeof(buf), m_file)) <= 0)
       {
-        fprintf(stderr, "Failed to read from '%s', errno: %d\n",
-                m_file_name, errno);
+	// ferror=0 will happen here if no queries executed yet
+	if (ferror(m_file))
+	  fprintf(stderr,
+	          "Failed to read from '%s', errno: %d, feof:%d, ferror:%d\n",
+	          m_file_name, errno, feof(m_file), ferror(m_file));
         DBUG_VOID_RETURN;
       }