database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixed a bug when printing error messages. stdout and stderr were

Browse Source 
mixed wrongly sometimes.
This commit is contained in:
unknown
2003-04-03 19:55:37 +03:00
parent 9c1c76bf2e
commit 6376b0a8b8
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/mysql.cc
View File

@@ -2405,31 +2405,32 @@ select_limit, max_join_size);
static int static int
put_info(const char *str,INFO_TYPE info_type,uint error) put_info(const char *str,INFO_TYPE info_type,uint error)
{ {
FILE *file= (info_type == INFO_ERROR ? stderr : stdout);
static int inited=0; static int inited=0;
if (status.batch) if (status.batch)
{ {
if (info_type == INFO_ERROR) if (info_type == INFO_ERROR)
{ {
(void) fflush(stdout); (void) fflush(file);
fprintf(stderr,"ERROR"); fprintf(file,"ERROR");
if (error) if (error)
(void) fprintf(stderr," %d",error); (void) fprintf(file," %d",error);
if (status.query_start_line && line_numbers) if (status.query_start_line && line_numbers)
{ {
(void) fprintf(stderr," at line %lu",status.query_start_line); (void) fprintf(file," at line %lu",status.query_start_line);
if (status.file_name) if (status.file_name)
(void) fprintf(stderr," in file: '%s'", status.file_name); (void) fprintf(file," in file: '%s'", status.file_name);
} }
(void) fprintf(stderr,": %s\n",str); (void) fprintf(file,": %s\n",str);
(void) fflush(stderr); (void) fflush(file);
if (!ignore_errors) if (!ignore_errors)
return 1; return 1;
} }
else if (info_type == INFO_RESULT && verbose > 1) else if (info_type == INFO_RESULT && verbose > 1)
tee_puts(str, stdout); tee_puts(str, file);
if (unbuffered) if (unbuffered)
fflush(stdout); fflush(file);
return info_type == INFO_ERROR ? -1 : 0; return info_type == INFO_ERROR ? -1 : 0;
} }
if (!opt_silent || info_type == INFO_ERROR) if (!opt_silent || info_type == INFO_ERROR)
@@ -2447,17 +2448,17 @@ put_info(const char *str,INFO_TYPE info_type,uint error)
putchar('\007'); /* This should make a bell */ putchar('\007'); /* This should make a bell */
vidattr(A_STANDOUT); vidattr(A_STANDOUT);
if (error) if (error)
(void) tee_fprintf(stderr, "ERROR %d: ", error); (void) tee_fprintf(file, "ERROR %d: ", error);
else else
tee_puts("ERROR: ", stdout); tee_puts("ERROR: ", file);
} }
else else
vidattr(A_BOLD); vidattr(A_BOLD);
(void) tee_puts(str, stdout); (void) tee_puts(str, file);
vidattr(A_NORMAL); vidattr(A_NORMAL);
} }
if (unbuffered) if (unbuffered)
fflush(stdout); fflush(file);
return info_type == INFO_ERROR ? -1 : 0; return info_type == INFO_ERROR ? -1 : 0;
} }