Commit 1fff863a authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/tmp_merge

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
parents 2fb56652 1a2a565d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ static void DB_error(MYSQL *mysql, const char *when)
  DBUG_ENTER("DB_error");
  fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,
          mysql_errno(mysql), mysql_error(mysql), when);
  fflush(stderr);
  safe_exit(EX_MYSQLERR);
  DBUG_VOID_RETURN;
} /* DB_error */