diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-02 15:03:20 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-02 15:03:20 -0800 |
| commit | 8bc5045ea377f39701f421cc7ae00756f79962d2 (patch) | |
| tree | 751d8bbe4d3844ab9dc16d0c07855e40028cbabc /mysql-test/r/mysqld--help.result | |
| parent | 8b469eb5151cb1b7da00cee3a7b42c10bd7ff51e (diff) | |
| parent | 2521ac0c7f2450d588fa1704a6eef785da8812a9 (diff) | |
| download | mariadb-git-8bc5045ea377f39701f421cc7ae00756f79962d2.tar.gz | |
Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 94d7465d39b..23b8a944d44 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -491,8 +491,8 @@ The following options may be given as the first argument: mrr_cost_based, mrr_sort_keys, optimize_join_buffer_size, outer_join_with_cache, partial_match_rowid_merge, partial_match_table_scan, semijoin, semijoin_with_cache, - subquery_cache, table_elimination } and val is one of - {on, off, default} + subquery_cache, table_elimination, extended_keys } and + val is one of {on, off, default} --performance-schema Enable the performance schema. --performance-schema-events-waits-history-long-size=# |