diff options
| author | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2016-05-06 16:07:53 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-07-25 11:44:57 -0400 |
| commit | 74f80b349924c7f0c091a0973dea0ec61191c2c9 (patch) | |
| tree | c6d0265edd1470a850c70eda77f773ea315ca85b /sql/sys_vars.cc | |
| parent | 5197fcf6b4611a26b3847d1101f1a4fb6d17570a (diff) | |
| download | mariadb-git-74f80b349924c7f0c091a0973dea0ec61191c2c9.tar.gz | |
MW-267 Enforce wsrep_max_ws_size limit in wsrep provider
This changes variable wsrep_max_ws_size so that its value
is linked to the value of provider option repl.max_ws_size.
That is, changing the value of variable wsrep_max_ws_size
will change the value of provider option repl.max_ws_size,
and viceversa.
The writeset size limit is always enforced in the provider,
regardless of which option is used.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 0bfa0bf5eb0..0ac8d40fbae 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4688,8 +4688,9 @@ static Sys_var_charptr Sys_wsrep_start_position ( static Sys_var_ulong Sys_wsrep_max_ws_size ( "wsrep_max_ws_size", "Max write set size (bytes)", GLOBAL_VAR(wsrep_max_ws_size), CMD_LINE(REQUIRED_ARG), - /* Upper limit is 65K short of 4G to avoid overlows on 32-bit systems */ - VALID_RANGE(1024, WSREP_MAX_WS_SIZE), DEFAULT(1073741824UL), BLOCK_SIZE(1)); + VALID_RANGE(1024, WSREP_MAX_WS_SIZE), DEFAULT(WSREP_MAX_WS_SIZE), + BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(wsrep_max_ws_size_update)); static Sys_var_ulong Sys_wsrep_max_ws_rows ( "wsrep_max_ws_rows", "Max number of rows in write set", |