database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.

Browse Source
This commit is contained in:
Igor Babaev
2012-03-02 15:03:20 -08:00
parent 8b469eb515 2521ac0c7f
commit 8bc5045ea3
18 changed files with 10538 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/mysqld--help.result
View File

@ -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=#