summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
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 /sql/sql_class.cc
parent8baf9b0c469e2845d15cc1181bc6b101cdfba087 (diff)
parentd5cd33450413816f8696125cd66c8393921e6267 (diff)
downloadmariadb-git-a02ba9c1c96f8245b2fd5c8b555c74204af421e3.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 666cdb3afc3..e397dd88a88 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1378,6 +1378,8 @@ void THD::init(void)
server_status= SERVER_STATUS_AUTOCOMMIT;
if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)
server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES;
+ if (variables.sql_mode & MODE_ANSI_QUOTES)
+ server_status|= SERVER_STATUS_ANSI_QUOTES;
transaction.all.modified_non_trans_table=
transaction.stmt.modified_non_trans_table= FALSE;