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

Bug fix to mysql.cc for windows version.

Browse Source
This commit is contained in:
jani@prima.mysql.com
2000-11-20 19:50:41 +02:00
parent 23dc1a6b85
commit 056fae6cfc
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/mysql.cc
View File

@ -109,7 +109,7 @@ static HashTable ht;
enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT}; enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
typedef enum enum_info_type INFO_TYPE; typedef enum enum_info_type INFO_TYPE;
const char *VER="11.4"; const char *VER="11.5";
static MYSQL mysql; /* The connection */ static MYSQL mysql; /* The connection */
static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0, static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0,
@ -763,16 +763,6 @@ static int read_lines(bool execute_commands)
status.query_start_line=line_number; status.query_start_line=line_number;
} }
else else
#ifdef __WIN__
{
tee_fprintf(stdout, glob_buffer.is_empty() ? "mysql> " :
!in_string ? " -> " :
in_string == '\'' ?
" '> " : " \"> ");
linebuffer[0]=(char) sizeof(linebuffer);
line=_cgets(linebuffer);
}
#else
{ {
if (opt_outfile) if (opt_outfile)
{ {
@ -783,14 +773,24 @@ static int read_lines(bool execute_commands)
in_string == '\'' ? in_string == '\'' ?
" '> " : " \"> ", OUTFILE); " '> " : " \"> ", OUTFILE);
} }
#ifdef __WIN__
tee_fprintf(stdout, glob_buffer.is_empty() ? "mysql> " :
!in_string ? " -> " :
in_string == '\'' ?
" '> " : " \"> ");
linebuffer[0]=(char) sizeof(linebuffer);
line=_cgets(linebuffer);
if (opt_outfile)
fprintf(OUTFILE, "%s\n", line);
#else
line=readline((char*) (glob_buffer.is_empty() ? "mysql> " : line=readline((char*) (glob_buffer.is_empty() ? "mysql> " :
!in_string ? " -> " : !in_string ? " -> " :
in_string == '\'' ? in_string == '\'' ?
" '> " : " \"> ")); " '> " : " \"> "));
if (opt_outfile) if (opt_outfile)
fprintf(OUTFILE, "%s\n", line); fprintf(OUTFILE, "%s\n", line);
}
#endif #endif
}
if (!line) // End of file if (!line) // End of file
{ {
status.exit_status=0; status.exit_status=0;