summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-06-30 13:28:39 +0200
committerSergei Golubchik <serg@mariadb.org>2017-06-30 13:28:39 +0200
commitd3cc15eb82c4d3704fa6b636ed2cd9a59479f022 (patch)
tree0db3bf965387bf40038ba8b4fbd9c6ded4005c48 /mysql-test/r/mysqltest.result
parentb503b1c0edaa976e90b9bf3339677a710752e58a (diff)
parent92928bcdd996da3bc1fd1bbe1147e277e024bf34 (diff)
downloadmariadb-git-d3cc15eb82c4d3704fa6b636ed2cd9a59479f022.tar.gz
Merge branch '10.0' into 10.1
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 dcb28baa18d..f904207d2da 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -962,4 +962,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