diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
| commit | 2250e9ea261f661cb73c147a28f4d30655d7483d (patch) | |
| tree | 04673b47943fdb137f8fe5bafdb64a24887f8c0f /sql/sql_help.cc | |
| parent | cb1e44219b9beae92e104cfe5e67aab3073dd8aa (diff) | |
| parent | 4ca7b226c05ae883accec64b1afe6d60daf1b323 (diff) | |
| download | mariadb-git-2250e9ea261f661cb73c147a28f4d30655d7483d.tar.gz | |
Merge 10.2 into 10.2-mdev9864.
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index a50b90fc111..1ddddaf1b40 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -672,7 +672,7 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, uint mlen, TRUE Error and send_error already commited */ -bool mysqld_help(THD *thd, const char *mask) +static bool mysqld_help_internal(THD *thd, const char *mask) { Protocol *protocol= thd->protocol; SQL_SELECT *select; @@ -854,3 +854,12 @@ error2: DBUG_RETURN(TRUE); } + +bool mysqld_help(THD *thd, const char *mask) +{ + ulonglong sql_mode_backup= thd->variables.sql_mode; + thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH; + bool rc= mysqld_help_internal(thd, mask); + thd->variables.sql_mode= sql_mode_backup; + return rc; +} |