diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-06 10:53:00 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-06 10:53:00 +0100 |
| commit | 02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1 (patch) | |
| tree | 4a6a8d578fedb4c2b1f437ab39c2d7430ad95163 /sql/sql_cache.h | |
| parent | 5f10870c8a8c2448bfc26d990110390d48000b84 (diff) | |
| parent | 478b83032b170b2ae030fa77fe4bed60a7910472 (diff) | |
| download | mariadb-git-02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1.tar.gz | |
Merge commit '10.4' into 10.5
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index b92b3972512..196acf6fa2e 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -558,11 +558,11 @@ struct Query_cache_query_flags uint character_set_client_num; uint character_set_results_num; uint collation_connection_num; + uint group_concat_max_len; ha_rows limit; Time_zone *time_zone; sql_mode_t sql_mode; ulonglong max_sort_length; - ulonglong group_concat_max_len; size_t default_week_format; size_t div_precision_increment; MY_LOCALE *lc_time_names; |