diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-10 07:43:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-10 07:43:28 +0300 |
| commit | 59762ac4fa4122dd986f0fe20eb7150e40eb4437 (patch) | |
| tree | 6855eb6a4e2f3726b2fe28a9020f985bef225af8 | |
| parent | e76ca24bb116ea4ca61d626e939b20e1e2338dc6 (diff) | |
| download | mariadb-git-59762ac4fa4122dd986f0fe20eb7150e40eb4437.tar.gz | |
MDEV-15053: Adjust results for innodb_page_hash_locks=64
This should have been part of
commit 70d4e55db94b62aa6cfcecdc25054554e7d44d18.
| -rw-r--r-- | mysql-test/suite/sys_vars/r/innodb_page_hash_locks_basic.result | 10 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb.result | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_page_hash_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_page_hash_locks_basic.result index e8915387aad..8368c863212 100644 --- a/mysql-test/suite/sys_vars/r/innodb_page_hash_locks_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_page_hash_locks_basic.result @@ -3,21 +3,21 @@ select @@global.innodb_page_hash_locks between 1 and 1024; 1 select @@global.innodb_page_hash_locks; @@global.innodb_page_hash_locks -16 +64 select @@session.innodb_page_hash_locks; ERROR HY000: Variable 'innodb_page_hash_locks' is a GLOBAL variable show global variables like 'innodb_page_hash_locks'; Variable_name Value -innodb_page_hash_locks 16 +innodb_page_hash_locks 64 show session variables like 'innodb_page_hash_locks'; Variable_name Value -innodb_page_hash_locks 16 +innodb_page_hash_locks 64 select * from information_schema.global_variables where variable_name='innodb_page_hash_locks'; VARIABLE_NAME VARIABLE_VALUE -INNODB_PAGE_HASH_LOCKS 16 +INNODB_PAGE_HASH_LOCKS 64 select * from information_schema.session_variables where variable_name='innodb_page_hash_locks'; VARIABLE_NAME VARIABLE_VALUE -INNODB_PAGE_HASH_LOCKS 16 +INNODB_PAGE_HASH_LOCKS 64 set global innodb_page_hash_locks=1; ERROR HY000: Variable 'innodb_page_hash_locks' is a read only variable set @@session.innodb_page_hash_locks='some'; diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 217bc77c9e2..501bf629038 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -1511,7 +1511,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_PAGE_HASH_LOCKS SESSION_VALUE NULL -DEFAULT_VALUE 16 +DEFAULT_VALUE 64 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2 |