diff options
| author | unknown <jimw@mysql.com> | 2005-05-07 01:05:19 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-07 01:05:19 -0700 |
| commit | 29fcd4b318cccf96fbdd68232c9b0596ead04f9d (patch) | |
| tree | 8bcca7a891703ba795d48e1ffe184cb8338c0fdc /client/mysql.cc | |
| parent | 78565b0775c0b8da8dd118341b9c023d4afc8c31 (diff) | |
| parent | 7dc31480deeba1d722bd9701921d3f042c3e7f51 (diff) | |
| download | mariadb-git-29fcd4b318cccf96fbdd68232c9b0596ead04f9d.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-9186
into mysql.com:/home/jimw/my/mysql-4.1-clean
client/mysql.cc:
Auto merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index cbcffb180c3..6a76a1fbd1b 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -950,7 +950,8 @@ static int read_lines(bool execute_commands) } else { - char *prompt= (char*) (glob_buffer.is_empty() ? construct_prompt() : + char *prompt= (char*) (ml_comment ? " /*> " : + glob_buffer.is_empty() ? construct_prompt() : !in_string ? " -> " : in_string == '\'' ? " '> " : (in_string == '`' ? |