diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-04 17:08:28 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-04 17:08:28 +0200 |
| commit | 7647c2744c95f23fa7a1f4aec98359f5a9a55e01 (patch) | |
| tree | 09d739e03d7203b9aab844694882c52417875513 /client | |
| parent | 3797ca41b39c862cf4733eadea8c91ed138ca1a4 (diff) | |
| parent | a1bd9532352aed69f03b632658b4ba20512b9cd1 (diff) | |
| download | mariadb-git-7647c2744c95f23fa7a1f4aec98359f5a9a55e01.tar.gz | |
Automatic merge with MariaDB 5.1
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 4cc7ef813c3..be4a3e06fbb 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1255,15 +1255,6 @@ void die(const char *fmt, ...) DBUG_ENTER("die"); DBUG_PRINT("enter", ("start_lineno: %d", start_lineno)); - /* - Protect against dying twice - first time 'die' is called, try to write log files - second time, just exit - */ - if (dying) - cleanup_and_exit(1); - dying= 1; - /* Print the error message */ fprintf(stderr, "mysqltest: "); if (cur_file && cur_file != file_stack) @@ -1282,6 +1273,15 @@ void die(const char *fmt, ...) fprintf(stderr, "\n"); fflush(stderr); + /* + Protect against dying twice + first time 'die' is called, try to write log files + second time, just exit + */ + if (dying) + cleanup_and_exit(1); + dying= 1; + log_file.show_tail(opt_tail_lines); /* |