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

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

Merge bk-internal:/home/bk/mysql-5.0-kt
into rama.(none):/home/jimw/my/mysql-5.0-17485
3fb0f420 · jimw@rama.(none) · 7350cb8b · 9a2a3c6e · 3fb0f420
Commit 3fb0f420 authored Jul 17, 2006 by jimw@rama.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

client/mysql.cc client/mysql.cc +4 -2

No files found.
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3642,12 +3642,14 @@ static const char* construct_prompt()
      case 'U':
 	if (!full_username)
 	  init_username();
-	processed_prompt.append(full_username);
+        processed_prompt.append(full_username ? full_username :
+                                (current_user ?  current_user : "(unknown)"));
 	break;
      case 'u':
 	if (!full_username)
 	  init_username();
-	processed_prompt.append(part_username);
+        processed_prompt.append(part_username ? part_username :
+                                (current_user ?  current_user : "(unknown)"));
 	break;
      case PROMPT_CHAR:
 	processed_prompt.append(PROMPT_CHAR);