From d1d6fe9abf6dc11745ee4432ab97a46cbb244bf5 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 28 May 2019 10:26:08 +0400 Subject: Using more of Sql_mode_save. Adding a similar class for THD::abort_on_warnings. --- sql/sql_help.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sql/sql_help.cc') 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; } -- cgit v1.2.1