diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-24 18:49:19 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 18:49:19 +0200 |
commit | 297d968a8c5b313c139c6d96b8bd26b57a7dc64c (patch) | |
tree | 41a8976be9dbfd8bd074f645489babb45d23b569 | |
parent | e3936b1065c501e958986ab70c1bebc24785de19 (diff) | |
download | mariadb-git-297d968a8c5b313c139c6d96b8bd26b57a7dc64c.tar.gz |
Run mysql_client_test without --silent
Flush both stdout and stderr before abort'ing mysql_client_test
mysql-test/mysql-test-run.pl:
Run mysql_client_test wihtout --silent flag
tests/mysql_client_test.c:
Before aborting mysql_client_test in die, make sure
to first flush stdout and finally after the error message
has been printed also fflush stderr
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 | ||||
-rw-r--r-- | tests/mysql_client_test.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f88cd333b91..731d07c86c5 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1735,7 +1735,7 @@ sub environment_setup () { # Setup env so childs can execute mysql_client_test # ---------------------------------------------------- my $cmdline_mysql_client_test= - "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " . + "$exe_mysql_client_test --no-defaults --testcase --user=root " . "--port=$master->[0]->{'port'} " . "--socket=$master->[0]->{'path_sock'}"; if ( $mysql_version_id >= 50000 ) diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 9fabde993b8..64c260666d3 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -113,7 +113,9 @@ static void client_disconnect(); void die(const char *file, int line, const char *expr) { + fflush(stdout); fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr); + fflush(stderr); abort(); } |