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

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

Browse Source 
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
This commit is contained in:
unknown
2005-01-15 23:19:34 -06:00
parent 193eae3bec
commit 31457a6258
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -180,6 +180,7 @@ ram@mysql.r18.ru
ram@ram.(none) ram@ram.(none)
ranger@regul.home.lan ranger@regul.home.lan
rburnett@build.mysql.com rburnett@build.mysql.com
reggie@bob.(none)
root@home.(none) root@home.(none)
root@mc04.(none) root@mc04.(none)
root@x3.internalnet root@x3.internalnet

10
client/mysql.cc
View File

@ -3232,13 +3232,20 @@ static const char* construct_prompt()
break; break;
} }
case 'p': case 'p':
{
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (!connected) if (!connected)
{ {
processed_prompt.append("not_connected"); processed_prompt.append("not_connected");
break; 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) !mysql.unix_socket)
add_int_to_prompt(mysql.port); add_int_to_prompt(mysql.port);
else else
@ -3247,6 +3254,7 @@ static const char* construct_prompt()
processed_prompt.append(pos ? pos+1 : mysql.unix_socket); processed_prompt.append(pos ? pos+1 : mysql.unix_socket);
} }
#endif #endif
}
break; break;
case 'U': case 'U':
if (!full_username) if (!full_username)