diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:20:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:20:42 +0300 |
| commit | 5e01255732f554bbf473347566439fd18c006756 (patch) | |
| tree | f174de61c99f8b6428395b0275e885ee500365b6 /mysql-test/main/mysqld--help.result | |
| parent | 6c3b1dced41c238f814aeabbc725e31c3106c0f4 (diff) | |
| parent | d84a2826290d9676faebba0849d1b9fb7f5efcd8 (diff) | |
| download | mariadb-git-5e01255732f554bbf473347566439fd18c006756.tar.gz | |
Merge 10.11 into 11.0
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 458a2ceaad0..fb059b8b988 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -367,7 +367,7 @@ The following specify which files/extra groups are read (specified before remain log. Slave 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 + transactions that duplicate existing ones in binlog are ignored without error and slave interruption. -?, --help Display this help and exit. --histogram-size=# Number of bytes used for a histogram. If set to 0, no @@ -731,7 +731,7 @@ The following specify which files/extra groups are read (specified before remain expected to be in the engine cache. --optimizer-extra-pruning-depth=# If the optimizer needs to enumerate join prefix of this - size or larger, then it will try agressively prune away + size or larger, then it will try aggressively prune away the search space. --optimizer-index-block-copy-cost=# Cost of copying a key block from the cache to intern |