Commit 3709da1a authored by unknown's avatar unknown
Browse files

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
parents fabab792 83c87624

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -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");