diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-15 16:44:52 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-15 16:44:52 +1100 |
| commit | a9500860367c9ef4ac67c9c41c81dcfad13dc836 (patch) | |
| tree | f31a017c98c57499434411f9143c80297bc9f252 /sql/sys_vars.cc | |
| parent | bfed2c7d57a7ca34936d6ef0688af7357592dc40 (diff) | |
| parent | 6de482a6fefac0c21daf33ed465644151cdf879f (diff) | |
| download | mariadb-git-a9500860367c9ef4ac67c9c41c81dcfad13dc836.tar.gz | |
Merge 10.2 (part) into 10.3
commit '6de482a6fefac0c21daf33ed465644151cdf879f'
10.3 no longer errors in truncate_notembedded.test
but per comments, a non-crash is all that we are after.
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 2d641d9fe20..f04b295a953 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -6145,7 +6145,7 @@ static Sys_var_ulong Sys_log_tc_size( 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), |