summaryrefslogtreecommitdiff
path: root/sql/sql_help.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-05-28 10:26:08 +0400
committerAlexander Barkov <bar@mariadb.com>2019-05-28 10:26:08 +0400
commitd1d6fe9abf6dc11745ee4432ab97a46cbb244bf5 (patch)
tree59b4f50b1627ff5c07c48490142ede8c9cd3ae18 /sql/sql_help.cc
parentc0cd662b986c378d536cff511ba7ba342fcd7012 (diff)
downloadmariadb-git-d1d6fe9abf6dc11745ee4432ab97a46cbb244bf5.tar.gz
Using more of Sql_mode_save. Adding a similar class for THD::abort_on_warnings.
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r--sql/sql_help.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index e3e22bf38fb..c9307b578fc 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -856,9 +856,7 @@ error2:
bool mysqld_help(THD *thd, const char *mask)
{
- sql_mode_t sql_mode_backup= thd->variables.sql_mode;
- thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH;
+ Sql_mode_instant_remove sms(thd, MODE_PAD_CHAR_TO_FULL_LENGTH);
bool rc= mysqld_help_internal(thd, mask);
- thd->variables.sql_mode= sql_mode_backup;
return rc;
}