Commit ba1f194f authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
parents ec90a4dc 3caef95e
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -727,13 +727,6 @@ void die(const char *fmt, ...)
  va_start(args, fmt);
  if (fmt)
  {
#ifdef DBUG_ON
#ifndef __WIN__
    char buff[256];
    vsnprintf(buff, sizeof(buff), fmt, args);
    DBUG_PRINT("error", ("%s", buff));
#endif
#endif
    fprintf(stderr, "mysqltest: ");
    if (cur_file && cur_file != file_stack)
      fprintf(stderr, "In included file \"%s\": ",