diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-23 19:28:02 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-23 19:28:02 +0100 |
| commit | 25561435e0b1fe42ec29d5ab06dc15875cdd1cfa (patch) | |
| tree | d2e67d4509577d84da7ade2820154c904180e151 /sql/sql_cache.h | |
| parent | fa1aef39ebc7d84d24d4e3d2124f982526632ee9 (diff) | |
| parent | 8d8370e31d48e0bc6139c18770746f9959c21598 (diff) | |
| download | mariadb-git-25561435e0b1fe42ec29d5ab06dc15875cdd1cfa.tar.gz | |
Merge branch '10.2' into 10.3
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 92635ecacc7..d59bc37b7a3 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; |