diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:23:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:23:21 +0300 |
| commit | 2b61ff8f2221745f0a96855a0feb0825c426f993 (patch) | |
| tree | 380937271691f782d506ecd0fc349e53b8baccc0 /sql/sys_vars.cc | |
| parent | 7bd225e12905c0adc9677a8e53a324c773fd3536 (diff) | |
| parent | 5e01255732f554bbf473347566439fd18c006756 (diff) | |
| download | mariadb-git-2b61ff8f2221745f0a96855a0feb0825c426f993.tar.gz | |
Merge 11.0 into 11.1
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 28443c8f4f7..008339b535b 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2078,7 +2078,7 @@ Sys_gtid_strict_mode( "stops with an error if it encounters an event that would cause it to " "generate an out-of-order binlog if executed. " "When ON the same server-id semisync-replicated transactions that " - "duplicate exising ones in binlog are ignored without error " + "duplicate existing ones in binlog are ignored without error " "and slave interruption.", GLOBAL_VAR(opt_gtid_strict_mode), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); @@ -2843,7 +2843,7 @@ static Sys_var_ulong Sys_optimizer_search_depth( static Sys_var_ulong Sys_optimizer_extra_pruning_depth( "optimizer_extra_pruning_depth", "If the optimizer needs to enumerate join prefix of this size or " - "larger, then it will try agressively prune away the search space.", + "larger, then it will try aggressively prune away the search space.", SESSION_VAR(optimizer_extra_pruning_depth), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, MAX_TABLES+1), DEFAULT(8), BLOCK_SIZE(1)); |