diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-06-28 10:10:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-06-28 10:10:31 +0200 |
| commit | a02ba9c1c96f8245b2fd5c8b555c74204af421e3 (patch) | |
| tree | 8d84e04d7ee6ec5713a120f2fb1ac436d0348508 /client/mysql.cc | |
| parent | 8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff) | |
| parent | d5cd33450413816f8696125cd66c8393921e6267 (diff) | |
| download | mariadb-git-a02ba9c1c96f8245b2fd5c8b555c74204af421e3.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 3461f8bbc75..faef4670b31 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2321,8 +2321,10 @@ static bool add_line(String &buffer, char *line, ulong line_length, continue; } #endif - if (!*ml_comment && inchar == '\\' && - !(*in_string && + if (!*ml_comment && inchar == '\\' && *in_string != '`' && + !(*in_string == '"' && + (mysql.server_status & SERVER_STATUS_ANSI_QUOTES)) && + !(*in_string && (mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))) { // Found possbile one character command like \c |