diff options
| author | unknown <msvensson@shellback.(none)> | 2006-07-30 19:33:48 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-07-30 19:33:48 +0200 |
| commit | 3709da1ab7fc1893758e611904e96610403655e9 (patch) | |
| tree | e65953c879cb5261000c44bb08b92ceeb0aae07d /client/mysqltest.c | |
| parent | fabab79291b1d80e85f22015423423e12467365e (diff) | |
| parent | 83c87624fa1395c7ce36d869b1cd97fcc8425a84 (diff) | |
| download | mariadb-git-3709da1ab7fc1893758e611904e96610403655e9.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug21217/my41-bug21217
into shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217
client/mysqltest.c:
Manual merge 4.1->5.0
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 2fc09fbc3d2..caa89976047 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -177,7 +177,7 @@ typedef struct static test_file file_stack[MAX_INCLUDE_DEPTH]; static test_file* cur_file; static test_file* file_stack_end; -uint start_lineno; /* Start line of query */ +uint start_lineno= 0; /* Start line of query */ static char TMPDIR[FN_REFLEN]; static char delimiter[MAX_DELIMITER]= DEFAULT_DELIMITER; @@ -620,7 +620,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"); |