diff options
| author | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-07 08:25:58 -0700 |
| commit | 474a4d5d8d997f7cc068a8d1b4a14138e3bc55af (patch) | |
| tree | 0a1534765795d08014f77b4124d29d383bf130ed /client/mysql.cc | |
| parent | de275d94d2b69048e973986e3df3dad8beb6f332 (diff) | |
| parent | 29fcd4b318cccf96fbdd68232c9b0596ead04f9d (diff) | |
| download | mariadb-git-474a4d5d8d997f7cc068a8d1b4a14138e3bc55af.tar.gz | |
Merge
BUILD/FINISH.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_heap.cc:
Auto merged
mysql-test/r/create.result:
Merge changes
mysql-test/r/temp_table.result:
SCCS merged
mysql-test/t/temp_table.test:
Merge new tests
sql/item.cc:
Merge from 4.1
sql/sql_select.cc:
Merge from 4.1
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 8ea8f234b7c..c3a3b3df6d4 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -962,7 +962,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 == '`' ? |