diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
| commit | 530a6e74819ec14b5fdc42aa588b236ecb9f2fcd (patch) | |
| tree | a4d45b1fd0e434c23577507364fa443226676eb5 /mysql-test/r/mysqld--help.result | |
| parent | 5088cbf4ed7224698678f3eaf406361c6e7db4b8 (diff) | |
| parent | 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 (diff) | |
| download | mariadb-git-530a6e74819ec14b5fdc42aa588b236ecb9f2fcd.tar.gz | |
Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index fc22af6b9be..65a0fad4a84 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -667,6 +667,9 @@ The following options may be given as the first argument: --performance-schema-max-cond-instances=# Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. + --performance-schema-max-digest-length=# + Maximum length considered for digest text, when stored in + performance_schema tables. --performance-schema-max-file-classes=# Maximum number of file instruments. --performance-schema-max-file-handles=# @@ -1316,6 +1319,7 @@ performance-schema-hosts-size -1 performance-schema-instrument performance-schema-max-cond-classes 80 performance-schema-max-cond-instances -1 +performance-schema-max-digest-length 1024 performance-schema-max-file-classes 50 performance-schema-max-file-handles 32768 performance-schema-max-file-instances -1 |