diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-14 18:02:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-14 18:02:40 +0200 |
| commit | 9ecd76652664ec92836ce8c4a7a98ff5dbe7bf46 (patch) | |
| tree | 69dfb4ef9c4f04930c8bc742010ad4b22a1f958f /mysql-test/suite/sys_vars | |
| parent | d79c3f3297f8f2f6bd44a52c95dbae1d06bd3976 (diff) | |
| parent | e8217d070fc3e60870131615a48515836c773b07 (diff) | |
| download | mariadb-git-9ecd76652664ec92836ce8c4a7a98ff5dbe7bf46.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/sys_vars')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff | 18 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb.result | 6 |
2 files changed, 3 insertions, 21 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff index ea9f47d8f3a..ee9a1eee717 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff @@ -371,15 +371,6 @@ VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 64 -@@ -1609,7 +1609,7 @@ - SESSION_VALUE NULL - DEFAULT_VALUE 4 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of background read I/O threads in InnoDB. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 64 @@ -1705,7 +1705,7 @@ SESSION_VALUE NULL DEFAULT_VALUE 1048576 @@ -429,12 +420,3 @@ VARIABLE_COMMENT Number of undo tablespaces to use. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 127 -@@ -2053,7 +2053,7 @@ - SESSION_VALUE NULL - DEFAULT_VALUE 4 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of background write I/O threads in InnoDB. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 64 diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 814decedd41..ae389b22d2a 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -1429,7 +1429,7 @@ VARIABLE_NAME INNODB_READ_IO_THREADS SESSION_VALUE NULL DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Number of background read I/O threads in InnoDB. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 64 @@ -1813,9 +1813,9 @@ VARIABLE_NAME INNODB_WRITE_IO_THREADS SESSION_VALUE NULL DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Number of background write I/O threads in InnoDB. -NUMERIC_MIN_VALUE 1 +NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 64 NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL |