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

Merge with 4.0.16

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-10-07 15:42:26 +03:00
parent 0091fa2e32 446d40e880
commit 6056cfadfc
167 changed files with 2872 additions and 6758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysql.cc
View File

@@ -44,7 +44,7 @@
#include <locale.h>
#endif
const char *VER= "14.1";
const char *VER= "14.2";
/* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024
@@ -860,7 +860,9 @@ static int read_lines(bool execute_commands)
char *prompt= (char*) (glob_buffer.is_empty() ? construct_prompt() :
!in_string ? " -> " :
in_string == '\'' ?
" '> " : " \"> ");
" '> " : (in_string == '`' ?
" `> " :
" \"> "));
if (opt_outfile && glob_buffer.is_empty())
fflush(OUTFILE);
@@ -2643,7 +2645,7 @@ com_status(String *buffer __attribute__((unused)),
(result=mysql_use_result(&mysql)))
{
MYSQL_ROW cur=mysql_fetch_row(result);
tee_fprintf(stdout, "Current database:\t%s\n",cur[0]);
tee_fprintf(stdout, "Current database:\t%s\n", cur[0] ? cur[0] : "");
tee_fprintf(stdout, "Current user:\t\t%s\n",cur[1]);
(void) mysql_fetch_row(result); // Read eof
}