forked from percona/percona-server
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from sensssz/vats-5.7
Fix error in test sys_vars.innodb_lock_schedule_algorithm_basic
- Loading branch information
Showing
2 changed files
with
19 additions
and
7 deletions.
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
mysql-test/suite/sys_vars/r/innodb_lock_schedule_algorithm_basic.result
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| SELECT @@global.innodb_lock_schedule_algorithm; | ||
| @@global.innodb_lock_schedule_algorithm | ||
| vats | ||
| SET GLOBAL innodb_lock_schedule_algorithm = 'FCFS'; | ||
| SELECT @@global.innodb_lock_schedule_algorithm; | ||
| @@global.innodb_lock_schedule_algorithm | ||
| fcfs | ||
| SET GLOBAL innodb_lock_schedule_algorithm = 'VATS'; | ||
| SELECT @@global.innodb_lock_schedule_algorithm; | ||
| @@global.innodb_lock_schedule_algorithm | ||
| vats | ||
| SET GLOBAL innodb_lock_schedule_algorithm = 'VATS'; |
14 changes: 7 additions & 7 deletions
14
mysql-test/suite/sys_vars/t/innodb_lock_schedule_algorithm_basic.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| -- source include/have_innodb.inc | ||
| # This is a debug variable for now | ||
| -- source include/have_debug.inc | ||
|
|
||
| SELECT @@global.innodb_lock_schedule_algorithm_basic; | ||
| SELECT @@global.innodb_lock_schedule_algorithm; | ||
|
|
||
| SET GLOBAL innodb_lock_schedule_algorithm_basic= 'FCFS'; | ||
| SET GLOBAL innodb_lock_schedule_algorithm = 'FCFS'; | ||
|
|
||
| SELECT @@global.innodb_buffer_pool_evict; | ||
| SELECT @@global.innodb_lock_schedule_algorithm; | ||
|
|
||
| SET GLOBAL innodb_lock_schedule_algorithm_basic= 'VATS'; | ||
| SET GLOBAL innodb_lock_schedule_algorithm = 'VATS'; | ||
|
|
||
| SELECT @@global.innodb_lock_schedule_algorithm_basic; | ||
| SELECT @@global.innodb_lock_schedule_algorithm; | ||
|
|
||
| # Reset state | ||
| SET GLOBAL innodb_lock_schedule_algorithm = 'VATS'; |