diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2003-06-02 14:14:10 +0300 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2003-06-02 14:14:10 +0300 |
| commit | 9bd57aa40ef614fd2343383723615b36509849b3 (patch) | |
| tree | 308a95efd00d72a96950ec966afc8bb9a5fe60df /client/mysql.cc | |
| parent | ec4a0ee4771749ee382c3c3ccbdb3565d9fe848c (diff) | |
| parent | eebdcd0c5f0cdde4c70cc68a383f73d309b85d5a (diff) | |
| download | mariadb-git-9bd57aa40ef614fd2343383723615b36509849b3.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 4ab97f1b3cf..171bd9cf0a8 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -40,7 +40,7 @@ #include <signal.h> #include <violite.h> -const char *VER= "12.20"; +const char *VER= "12.21"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 @@ -2615,14 +2615,18 @@ static const char* construct_prompt() add_int_to_prompt(++prompt_counter); break; case 'v': - processed_prompt.append(mysql_get_server_info(&mysql)); + if (connected) + processed_prompt.append(mysql_get_server_info(&mysql)); + else + processed_prompt.append("not_connected"); break; case 'd': processed_prompt.append(current_db ? current_db : "(none)"); break; case 'h': { - const char *prompt=mysql_get_host_info(&mysql); + const char *prompt; + prompt= connected ? mysql_get_host_info(&mysql) : "not_connected"; if (strstr(prompt, "Localhost")) processed_prompt.append("localhost"); else @@ -2633,8 +2637,13 @@ static const char* construct_prompt() break; } case 'p': - if (strstr(mysql_get_host_info(&mysql),"TCP/IP") || - ! mysql.unix_socket) + if (!connected) + { + processed_prompt.append("not_connected"); + break; + } + if (strstr(mysql_get_host_info(&mysql),"TCP/IP") || ! + mysql.unix_socket) add_int_to_prompt(mysql.port); else { |