Commit 29fcd4b3 authored by unknown's avatar unknown
Browse files

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
parents 78565b07 7dc31480

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -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 == '`' ?