diff options
| author | kostja@bodhi.local <> | 2006-08-02 21:54:10 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-08-02 21:54:10 +0400 |
| commit | 1b145118b92509b290e23adf30e64ffab8de9b7d (patch) | |
| tree | 3241b2854c0aa8cee9250880ef30eb407e84e7ec /client | |
| parent | 3d3bf24a937acd0fb7802dcd15ceec2bdb93feb4 (diff) | |
| parent | 83896aa8f6b4a4df9702a1ed8ec48415a554b72a (diff) | |
| download | mariadb-git-1b145118b92509b290e23adf30e64ffab8de9b7d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 3 | ||||
| -rw-r--r-- | client/mysqltest.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 94b43d030e8..0b7284426c5 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1221,7 +1221,8 @@ static bool add_line(String &buffer,char *line,char *in_string, continue; } #endif - if (!*ml_comment && inchar == '\\') + if (!*ml_comment && inchar == '\\' && + !(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)) { // Found possbile one character command like \c diff --git a/client/mysqltest.c b/client/mysqltest.c index 2fc09fbc3d2..352971c4c38 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -620,7 +620,7 @@ static void die(const char *fmt, ...) if (cur_file && cur_file != file_stack) fprintf(stderr, "In included file \"%s\": ", cur_file->file_name); - if (start_lineno != 0) + if (start_lineno > 0) fprintf(stderr, "At line %u: ", start_lineno); vfprintf(stderr, fmt, args); fprintf(stderr, "\n"); |