Commit bc0c886d authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

Merge 192.168.0.20:mysql/bug21217/my51-bug21217

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
parents fdfad1d0 25a5678e
...@@ -180,7 +180,7 @@ typedef struct ...@@ -180,7 +180,7 @@ typedef struct
static test_file file_stack[MAX_INCLUDE_DEPTH]; static test_file file_stack[MAX_INCLUDE_DEPTH];
static test_file* cur_file; static test_file* cur_file;
static test_file* file_stack_end; static test_file* file_stack_end;
uint start_lineno; /* Start line of query */ uint start_lineno= 0; /* Start line of query */
/* Stores regex substitutions */ /* Stores regex substitutions */
...@@ -660,7 +660,7 @@ static void die(const char *fmt, ...) ...@@ -660,7 +660,7 @@ static void die(const char *fmt, ...)
if (cur_file && cur_file != file_stack) if (cur_file && cur_file != file_stack)
fprintf(stderr, "In included file \"%s\": ", fprintf(stderr, "In included file \"%s\": ",
cur_file->file_name); cur_file->file_name);
if (start_lineno != 0) if (start_lineno > 0)
fprintf(stderr, "At line %u: ", start_lineno); fprintf(stderr, "At line %u: ", start_lineno);
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment