diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-16 17:51:49 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-17 17:03:24 +1100 |
| commit | b73d85277939e3edff90e1ff927218a541a2c136 (patch) | |
| tree | 89d82c9686e5f28689ef9546dbe5fe8b47009ce4 /sql/sys_vars.cc | |
| parent | 73fee39ea62037780c59161507e89dd76c10b7a3 (diff) | |
| parent | 069139a549a62f26d566c1aea2a49c13e9e8a654 (diff) | |
| download | mariadb-git-b73d85277939e3edff90e1ff927218a541a2c136.tar.gz | |
Merge 10.4 to 10.5
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 12d0631019e..07aad0b5d3a 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -6632,7 +6632,7 @@ static Sys_var_ulong Sys_log_tc_size( DEFAULT(my_getpagesize() * 6), BLOCK_SIZE(my_getpagesize())); #endif -static Sys_var_ulonglong Sys_max_thread_mem( +static Sys_var_ulonglong Sys_max_session_mem_used( "max_session_mem_used", "Amount of memory a single user session " "is allowed to allocate. This limits the value of the " "session variable MEM_USED", SESSION_VAR(max_mem_used), |