From 3443fdf954dbe604db66386711ba3e36116beba0 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Thu, 3 Feb 2005 16:14:02 -0800
Subject: [PATCH] Handle backslashes correctly in strings that also have
 doubled quotes when we are using the NO_BACKSLASH_ESCAPES SQL mode. (Bug
 #6368)

mysql-test/t/sql_mode.test:
  Add regression test for Bug #6368
mysql-test/r/sql_mode.result:
  Add new results
sql/sql_lex.cc:
  Handle NO_BACKSLASH_ESCAPES mode when copying string that
  also has escapes due to doubled quotes
---
 mysql-test/r/sql_mode.result | 14 ++++++++++++++
 mysql-test/t/sql_mode.test   | 10 ++++++++++
 sql/sql_lex.cc               |  3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index 5492a7a65fc..09adc48259c 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -386,4 +386,18 @@ p	mask	example
 20	\\\\%	\\\\%
 20	\\\\%	\\\\_
 DROP TABLE t1;
+SET @@SQL_MODE='NO_BACKSLASH_ESCAPES';
+SELECT 'a\\b', 'a\\\"b', 'a''\\b', 'a''\\\"b';
+a\\b	a\\\"b	a'\\b	a'\\\"b
+a\\b	a\\\"b	a'\\b	a'\\\"b
+SELECT "a\\b", "a\\\'b", "a""\\b", "a""\\\'b";
+a\\b	a\\\'b	a"\\b	a"\\\'b
+a\\b	a\\\'b	a"\\b	a"\\\'b
+SET @@SQL_MODE='';
+SELECT 'a\\b', 'a\\\"b', 'a''\\b', 'a''\\\"b';
+a\b	a\"b	a'\b	a'\"b
+a\b	a\"b	a'\b	a'\"b
+SELECT "a\\b", "a\\\'b", "a""\\b", "a""\\\'b";
+a\b	a\'b	a"\b	a"\'b
+a\b	a\'b	a"\b	a"\'b
 SET @@SQL_MODE=@OLD_SQL_MODE;
diff --git a/mysql-test/t/sql_mode.test b/mysql-test/t/sql_mode.test
index fa5c6cb8a5b..e80752eb71b 100644
--- a/mysql-test/t/sql_mode.test
+++ b/mysql-test/t/sql_mode.test
@@ -174,4 +174,14 @@ order by masks.p, example;
 
 DROP TABLE t1;
 
+# Bug #6368: Make sure backslashes mixed with doubled quotes are handled
+# correctly in NO_BACKSLASH_ESCAPES mode
+SET @@SQL_MODE='NO_BACKSLASH_ESCAPES';
+SELECT 'a\\b', 'a\\\"b', 'a''\\b', 'a''\\\"b';
+SELECT "a\\b", "a\\\'b", "a""\\b", "a""\\\'b";
+
+SET @@SQL_MODE='';
+SELECT 'a\\b', 'a\\\"b', 'a''\\b', 'a''\\\"b';
+SELECT "a\\b", "a\\\'b", "a""\\b", "a""\\\'b";
+
 SET @@SQL_MODE=@OLD_SQL_MODE;
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 43e82ff57c9..7255b0aa64f 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -334,7 +334,8 @@ static char *get_text(LEX *lex)
 	      continue;
 	  }
 #endif
-	  if (*str == '\\' && str+1 != end)
+	  if (!(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&
+              *str == '\\' && str+1 != end)
 	  {
 	    switch(*++str) {
 	    case 'n':