diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-19 03:18:17 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-19 03:18:17 -0800 |
| commit | 2e73c5612071274bf2b8893a59c12c030b3b5c8b (patch) | |
| tree | f330f813e26b6997c5e4f8c65ad9df247a440bc0 /mysql-test/main/mysqld--help.result | |
| parent | 8283d7d2c029cb520214ae7d33af8851acc80892 (diff) | |
| parent | 764429271dc94e5af08706dd0ac6fb962c15726d (diff) | |
| download | mariadb-git-2e73c5612071274bf2b8893a59c12c030b3b5c8b.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev7486bb-10.4-mdev7486
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index e611c9b2dbf..bff1696d3d9 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -15,6 +15,10 @@ The following specify which files/extra groups are read (specified before remain --alter-algorithm[=name] Specify the alter table algorithm. One of: DEFAULT, COPY, INPLACE, NOCOPY, INSTANT + --analyze-sample-percentage=# + Percentage of rows from the table ANALYZE TABLE will + sample to collect table statistics. Set to 0 to let + MariaDB decide what percentage of rows to sample. -a, --ansi Use ANSI SQL syntax instead of MySQL syntax. This mode will also set transaction isolation level 'serializable'. --auto-increment-increment[=#] @@ -1386,6 +1390,7 @@ The following specify which files/extra groups are read (specified before remain Variables (--variable-name=value) allow-suspicious-udfs FALSE alter-algorithm DEFAULT +analyze-sample-percentage 100 auto-increment-increment 1 auto-increment-offset 1 autocommit TRUE @@ -1437,7 +1442,7 @@ encrypt-binlog FALSE encrypt-tmp-disk-tables FALSE encrypt-tmp-files FALSE enforce-storage-engine (No default value) -eq-range-index-dive-limit 10 +eq-range-index-dive-limit 200 event-scheduler OFF expensive-subquery-limit 100 expire-logs-days 0 @@ -1572,7 +1577,7 @@ old-style-user-limits FALSE optimizer-prune-level 1 optimizer-search-depth 62 optimizer-selectivity-sampling-limit 100 -optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on +optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on optimizer-trace optimizer-trace-max-mem-size 1048576 optimizer-use-condition-selectivity 4 |