diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-07-31 14:41:29 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-07-31 14:41:29 +0200 |
| commit | f49ad00d69bbbcb0667a28199bfcba444d02a922 (patch) | |
| tree | 77ba5b912aaf507684782ec14907899caf8343b1 | |
| parent | 6cf16daa4b02366f8a5051a310f309d29b819fcd (diff) | |
| parent | 83c87624fa1395c7ce36d869b1cd97fcc8425a84 (diff) | |
| download | mariadb-git-f49ad00d69bbbcb0667a28199bfcba444d02a922.tar.gz | |
Merge 192.168.0.20:mysql/bug21217/my41-bug21217
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| -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)) { /* |