summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-06-27 14:00:10 +0200
committerSergei Golubchik <serg@mariadb.org>2017-06-27 14:00:37 +0200
commitd5cd33450413816f8696125cd66c8393921e6267 (patch)
tree80c1a9b013e218aaee4ade6c55984a791dfe61ca /client/mysql.cc
parent39385ff7b253302723a94c896d199a83adb8622f (diff)
downloadmariadb-git-d5cd33450413816f8696125cd66c8393921e6267.tar.gz
MDEV-13187 incorrect backslash parsing in clients
cover ANSI_QUOTES and NO_BACKSLASH_ESCAPES in mysqltest
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 6a800e407a3..a965ced89c6 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2288,6 +2288,8 @@ static bool add_line(String &buffer, char *line, ulong line_length,
}
#endif
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)))
{