BUG#21435906 - MYSQLTEST DOES NOT FLUSH STDOUT

Sayantan Dutta · Sayantan Dutta · commit ae6ab7b2c1e5 · 2016-04-01T12:10:51.000+05:30
remove the check for stdout, additionally change mysqltest.test
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -722,7 +722,7 @@ class LogFile {
 
   void flush()
   {
-    if (m_file && m_file != stdout)
+    if (m_file)
     {
       if (fflush(m_file))
         die("Failed to flush '%s', errno: %d", m_file_name, errno);
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
@@ -717,8 +717,8 @@ Abcd
 select * from t1;;
 f1
 Abcd
-mysqltest: At line 2: Cannot run query on connection between send and reap
 select * from t1;;
+mysqltest: At line 2: Cannot run query on connection between send and reap
 drop table t1;
 mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'
 mysqltest: At line 1: Missing required argument 'directory' to command 'remove_files_wildcard'

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,7 @@ class LogFile {`
`722`	`722`
`723`	`723`	`void flush()`
`724`	`724`	`{`
`725`		`- if (m_file && m_file != stdout)`
	`725`	`+ if (m_file)`
`726`	`726`	`{`
`727`	`727`	`if (fflush(m_file))`
`728`	`728`	`die("Failed to flush '%s', errno: %d", m_file_name, errno);`