summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2017-07-20 08:56:09 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2017-07-20 08:56:09 +0300
commita481de30bb972f055cff088a84a211c1acd5be38 (patch)
tree680d500eddf7b51bd2086218a01a42b28efa1f51 /sql/sys_vars.cc
parente8a2a751212a04e835b2b03408132ecbbab52410 (diff)
parent59fca5806af65c8379a993f9e604cb0b20a76e2b (diff)
downloadmariadb-git-a481de30bb972f055cff088a84a211c1acd5be38.tar.gz
Merge tag 'mariadb-5.5.57' into 5.5-galera
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 581a5f18746..a0475c136ae 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -2194,6 +2194,10 @@ static bool fix_sql_mode(sys_var *self, THD *thd, enum_var_type type)
thd->server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES;
else
thd->server_status&= ~SERVER_STATUS_NO_BACKSLASH_ESCAPES;
+ if (thd->variables.sql_mode & MODE_ANSI_QUOTES)
+ thd->server_status|= SERVER_STATUS_ANSI_QUOTES;
+ else
+ thd->server_status&= ~SERVER_STATUS_ANSI_QUOTES;
}
return false;
}