Commit eca06077 authored by Dan Ungureanu's avatar Dan Ungureanu Committed by Sergey Vojtovich

MDEV-505: feature request: add \H option for mysql client prompt

Introduce `\H` option which behaves mostly like `\h`. The only exception is
when the client connects to the server hosted on localhost. In this case, the
hostname will be used instead.
parent f2afeb38
...@@ -5112,17 +5112,29 @@ static const char *construct_prompt() ...@@ -5112,17 +5112,29 @@ static const char *construct_prompt()
processed_prompt.append("unknown"); processed_prompt.append("unknown");
break; break;
case 'h': case 'h':
case 'H':
{ {
const char *prompt; const char *prompt;
prompt= connected ? mysql_get_host_info(&mysql) : "not_connected"; prompt= connected ? mysql_get_host_info(&mysql) : "not_connected";
if (strstr(prompt, "Localhost")) if (strstr(prompt, "Localhost"))
processed_prompt.append("localhost"); {
else if (*c == 'h')
{ processed_prompt.append("localhost");
const char *end=strcend(prompt,' '); else
processed_prompt.append(prompt, (uint) (end-prompt)); {
} char hostname[HOST_NAME_MAX];
break; if (gethostname(hostname, sizeof(hostname)) == 0)
processed_prompt.append(hostname);
else
processed_prompt.append("gethostname(2) failed");
}
}
else
{
const char *end=strcend(prompt,' ');
processed_prompt.append(prompt, (uint) (end-prompt));
}
break;
} }
case 'p': case 'p':
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment