diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-28 14:17:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-28 14:17:09 +0200 |
| commit | a983b2440767db660bdf38c4f8bb3a0b0f7b1d65 (patch) | |
| tree | 04beefc3687b10e2e2322e7c586aede2c4e272a2 /mysql-test/main/mysqld--help.result | |
| parent | a915142f48a42237021be590de37ffab4cc5b107 (diff) | |
| parent | bc891054962bc7cbd249f1ff75c64adb3b5bbc59 (diff) | |
| download | mariadb-git-a983b2440767db660bdf38c4f8bb3a0b0f7b1d65.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index b0694a5c82b..7d83cf71529 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1636,7 +1636,7 @@ performance-schema-events-waits-history-long-size -1 performance-schema-events-waits-history-size -1 performance-schema-hosts-size -1 performance-schema-instrument -performance-schema-max-cond-classes 80 +performance-schema-max-cond-classes 90 performance-schema-max-cond-instances -1 performance-schema-max-digest-length 1024 performance-schema-max-file-classes 50 |