diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-24 01:59:03 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-24 01:59:03 +0100 |
| commit | b7cf6abe521160a9b9a905df3bdfe134f1336d39 (patch) | |
| tree | 039c60119e2569a7e186def9a924b67478eab429 /mysql-test/r/mysqld--help-notwin.result | |
| parent | c492296127b55f35f4dd78ba8829b65d3a5c0740 (diff) | |
| parent | 19d13a3b17d613c04acbcd8c7a0578a55e0c2938 (diff) | |
| download | mariadb-git-b7cf6abe521160a9b9a905df3bdfe134f1336d39.tar.gz | |
merge
Diffstat (limited to 'mysql-test/r/mysqld--help-notwin.result')
| -rw-r--r-- | mysql-test/r/mysqld--help-notwin.result | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result index e1e484d4dd8..2badf5e5d09 100644 --- a/mysql-test/r/mysqld--help-notwin.result +++ b/mysql-test/r/mysqld--help-notwin.result @@ -400,6 +400,8 @@ The following options may be given as the first argument: After this many write locks, allow some read locks to run in between --memlock Lock mysqld in memory. + --metadata-locks-cache-size=# + Size of unused metadata locks cache --min-examined-row-limit=# Don't write queries to slow log that examine fewer rows than that @@ -895,7 +897,7 @@ init-slave interactive-timeout 28800 join-buffer-size 131072 join-buffer-space-limit 2097152 -join-cache-level 1 +join-cache-level 2 keep-files-on-create FALSE key-buffer-size 134217728 key-cache-age-threshold 300 @@ -953,6 +955,7 @@ max-tmp-tables 32 max-user-connections 0 max-write-lock-count 18446744073709551615 memlock FALSE +metadata-locks-cache-size 1024 min-examined-row-limit 0 mrr-buffer-size 262144 multi-range-count 256 @@ -975,7 +978,7 @@ old-passwords FALSE old-style-user-limits FALSE optimizer-prune-level 1 optimizer-search-depth 62 -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=off,derived_with_keys=off,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=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=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=off,table_elimination=on performance-schema FALSE performance-schema-events-waits-history-long-size 10000 performance-schema-events-waits-history-size 10 |