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

Merge bk-internal:/home/bk/mysql-5.0-kt

into  rama.(none):/home/jimw/my/mysql-5.0-17485


client/mysql.cc:
  Auto merged
This commit is contained in:
unknown
2006-07-17 12:55:36 -07:00

View File

@@ -3642,12 +3642,14 @@ static const char* construct_prompt()
case 'U': case 'U':
if (!full_username) if (!full_username)
init_username(); init_username();
processed_prompt.append(full_username); processed_prompt.append(full_username ? full_username :
(current_user ? current_user : "(unknown)"));
break; break;
case 'u': case 'u':
if (!full_username) if (!full_username)
init_username(); init_username();
processed_prompt.append(part_username); processed_prompt.append(part_username ? part_username :
(current_user ? current_user : "(unknown)"));
break; break;
case PROMPT_CHAR: case PROMPT_CHAR:
processed_prompt.append(PROMPT_CHAR); processed_prompt.append(PROMPT_CHAR);