1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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
This commit is contained in:
unknown
2005-05-07 01:05:19 -07:00

View File

@@ -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 == '`' ?