diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-04-03 06:54:08 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 23:54:08 +0400 |
| commit | e8351934b68d6d3ee273292eaa2ece203bb2b846 (patch) | |
| tree | aee7b27179323f7d0b7a7718dfb136c3655eee1b /mysql-test/main/mysqld--help,win.rdiff | |
| parent | 3bb5c6b0c21707ed04f93fb30c654caabba69f06 (diff) | |
| download | mariadb-git-e8351934b68d6d3ee273292eaa2ece203bb2b846.tar.gz | |
Merge pull request #1221 from grooverdan/10.4-MDEV-18851-multiple-sized-large-page-support
MDEV-18851: multiple sized large page support (linux)
Diffstat (limited to 'mysql-test/main/mysqld--help,win.rdiff')
| -rw-r--r-- | mysql-test/main/mysqld--help,win.rdiff | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/mysql-test/main/mysqld--help,win.rdiff b/mysql-test/main/mysqld--help,win.rdiff index 77f6f76858f..91b0540c879 100644 --- a/mysql-test/main/mysqld--help,win.rdiff +++ b/mysql-test/main/mysqld--help,win.rdiff @@ -1,13 +1,5 @@ --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result -@@ -419,7 +419,6 @@ - The number of segments in a key cache - -L, --language=name Client error messages in given language. May be given as - a full path. Deprecated. Use --lc-messages-dir instead. -- --large-pages Enable support for large pages - --lc-messages=name Set the language used for the error messages. - -L, --lc-messages-dir=name - Directory where error messages are @@ -647,6 +646,7 @@ Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME, DATETIME, TIMESTAMP columns. @@ -58,14 +50,6 @@ --transaction-alloc-block-size=# Allocation block size for transactions to be stored in binary log -@@ -1513,7 +1523,6 @@ - key-cache-division-limit 100 - key-cache-file-hash-size 512 - key-cache-segments 0 --large-pages FALSE - lc-messages en_US - lc-messages-dir MYSQL_SHAREDIR/ - lc-time-names en_US @@ -1587,6 +1596,7 @@ myisam-stats-method NULLS_UNEQUAL myisam-use-mmap FALSE |