Commit 1fff863a authored by unknown's avatar unknown

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
...@@ -865,6 +865,7 @@ static void DB_error(MYSQL *mysql, const char *when) ...@@ -865,6 +865,7 @@ static void DB_error(MYSQL *mysql, const char *when)
DBUG_ENTER("DB_error"); DBUG_ENTER("DB_error");
fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname, fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,
mysql_errno(mysql), mysql_error(mysql), when); mysql_errno(mysql), mysql_error(mysql), when);
fflush(stderr);
safe_exit(EX_MYSQLERR); safe_exit(EX_MYSQLERR);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} /* DB_error */ } /* DB_error */
......
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