diff options
| author | unknown <msvensson@shellback.(none)> | 2006-07-30 19:30:20 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-07-30 19:30:20 +0200 |
| commit | 83c87624fa1395c7ce36d869b1cd97fcc8425a84 (patch) | |
| tree | d09fa5ce2ddc2a68935eed657fae13d12ac83c1e /client | |
| parent | e4e67d587e5714a4faaa60da80f0fc51ac99d7a7 (diff) | |
| download | mariadb-git-83c87624fa1395c7ce36d869b1cd97fcc8425a84.tar.gz | |
BUG#21217 "mysqltest" client is inconsistent when to log a line number
- Init start_lineno to 0
client/mysqltest.c:
Init start_lineno to 0 and set it back to zero before comparing result file.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 3f2e7d8edb6..ad0f9f857bb 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -147,7 +147,7 @@ const char *user = 0, *host = 0, *unix_sock = 0, *opt_basedir="./"; static int port = 0; static my_bool opt_big_test= 0, opt_compress= 0, silent= 0, verbose = 0; static my_bool tty_password= 0, ps_protocol= 0, ps_protocol_enabled= 0; -static uint start_lineno, *lineno; +static uint start_lineno= 0, *lineno; const char *manager_user="root",*manager_host=0; char *manager_pass=0; int manager_port=MYSQL_MANAGER_PORT; @@ -580,7 +580,7 @@ static void die(const char *fmt, ...) if (cur_file && cur_file != file_stack) fprintf(stderr, "In included file \"%s\": ", cur_file->file_name); - if (start_lineno != 0) + if (start_lineno > 0) fprintf(stderr, "At line %u: ", start_lineno); vfprintf(stderr, fmt, args); fprintf(stderr, "\n"); @@ -4072,6 +4072,8 @@ int main(int argc, char **argv) parser.current_line += current_line_inc; } + start_lineno= 0; + if (!query_executed && result_file && my_stat(result_file, &res_info, 0)) { /* |