diff options
| author | Vesa Pentti <vesa.pentti@mariadb.com> | 2017-10-08 22:15:00 +0300 |
|---|---|---|
| committer | Vesa Pentti <vesa.pentti@mariadb.com> | 2017-10-10 16:16:12 +0300 |
| commit | 93aadda513d8b5c2b49001514e235c4fdd73e08a (patch) | |
| tree | 7de265a46bab1d8c480f8fb444d40ae59b5f4100 /sql/sql_show.cc | |
| parent | c2509a1588ee1dc7351b67b2f9149003540015c4 (diff) | |
| download | mariadb-git-93aadda513d8b5c2b49001514e235c4fdd73e08a.tar.gz | |
MDEV-13149 -- show function status now works with PAD_CHAR_TO_FULL_LENGTH
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index d8ea232caea..6e045648591 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5716,6 +5716,10 @@ int fill_schema_proc(THD *thd, TABLE_LIST *tables, COND *cond) DBUG_RETURN(1); } + /* Disable padding temporarily so it doesn't break the query */ + ulonglong sql_mode_was = thd->variables.sql_mode; + thd->variables.sql_mode &= ~MODE_PAD_CHAR_TO_FULL_LENGTH; + if (proc_table->file->ha_index_init(0, 1)) { res= 1; @@ -5751,6 +5755,7 @@ err: (void) proc_table->file->ha_index_end(); close_system_tables(thd, &open_tables_state_backup); + thd->variables.sql_mode = sql_mode_was; DBUG_RETURN(res); } |