Commit 31457a62 authored by unknown's avatar unknown
Browse files

Bug #7922 prompt \p fails on Windows for shared-memory connections 

Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory


client/mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent 193eae3b

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ ram@mysql.r18.ru 
ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

root@home.(none)

root@mc04.(none)

root@x3.internalnet

client/mysql.cc

+9 −1
Original line number Diff line number Diff line
@@ -3232,13 +3232,20 @@ static const char* construct_prompt() 
	break;

      }

      case 'p':

      {

#ifndef EMBEDDED_LIBRARY

	if (!connected)

	{

	  processed_prompt.append("not_connected");

	  break;

	}

	if (strstr(mysql_get_host_info(&mysql),"TCP/IP") ||



	const char *host_info = mysql_get_host_info(&mysql);

	if (strstr(host_info, "memory")) 

	{

		processed_prompt.append( mysql.host );

	}

	else if (strstr(host_info,"TCP/IP") ||

	    !mysql.unix_socket)

	  add_int_to_prompt(mysql.port);

	else
@@ -3247,6 +3254,7 @@ static const char* construct_prompt() 
 	  processed_prompt.append(pos ? pos+1 : mysql.unix_socket);

	}

#endif

      }

	break;

      case 'U':

	if (!full_username)