summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-06-28 10:10:31 +0200
committerSergei Golubchik <serg@mariadb.org>2017-06-28 10:10:31 +0200
commita02ba9c1c96f8245b2fd5c8b555c74204af421e3 (patch)
tree8d84e04d7ee6ec5713a120f2fb1ac436d0348508 /mysql-test/r/mysqltest.result
parent8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff)
parentd5cd33450413816f8696125cd66c8393921e6267 (diff)
downloadmariadb-git-a02ba9c1c96f8245b2fd5c8b555c74204af421e3.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index fa054d457f9..b3d8fb93e1f 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -960,4 +960,9 @@ con1
con2
con2
-closed_connection-
+set sql_mode=no_backslash_escapes;
+select "foo\""bar";
+foo\"bar
+foo\"bar
+set sql_mode=default;
End of tests