summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-04-13 12:41:42 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2010-04-13 12:41:42 +0200
commitd5e9a45efdc0edd1ce5bb9741b0c1750e3a23b43 (patch)
tree08118f7c643c16fa246fb99acea1592275fdbded /client
parent5a5cbff970605952e1a086bf7a09d8b218fde5f6 (diff)
downloadmariadb-git-d5e9a45efdc0edd1ce5bb9741b0c1750e3a23b43.tar.gz
Bug #52214 Misleading error msg when test fails before having produced any query
output Print error message only if real error
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc7
1 files 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;
}