Commit ee513ab5 authored by unknown's avatar unknown
Browse files

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

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


client/mysql.cc:
  Auto merged
parents 1b6962a4 ff8f68d2

client/mysql.cc

+4 −2
Original line number Diff line number Diff line
@@ -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);