Commit 7e7ed0f6 authored by jimw@mysql.com's avatar jimw@mysql.com

Merge mysql.com:/home/jimw/my/mysql-4.1-9186

into mysql.com:/home/jimw/my/mysql-4.1-clean
parents 8d2a7fb1 3a6af0b2
...@@ -950,7 +950,8 @@ static int read_lines(bool execute_commands) ...@@ -950,7 +950,8 @@ static int read_lines(bool execute_commands)
} }
else 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 == '\'' ? in_string == '\'' ?
" '> " : (in_string == '`' ? " '> " : (in_string == '`' ?
......
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