diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 651461860a2..894f9a95ccb 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -1604,9 +1604,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NONE VARIABLE_NAME INNODB_LOCK_SCHEDULE_ALGORITHM SESSION_VALUE NULL -GLOBAL_VALUE vats +GLOBAL_VALUE fcfs GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE vats +DEFAULT_VALUE fcfs VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM VARIABLE_COMMENT The algorithm Innodb uses for deciding which locks to grant next when a lock is released. Possible values are FCFS grant the locks in First-Come-First-Served order; VATS use the Variance-Aware-Transaction-Scheduling algorithm, which uses an Eldest-Transaction-First heuristic. diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index e9d7a6d94df..deb6f05e853 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -20424,7 +20424,7 @@ static MYSQL_SYSVAR_ENUM(lock_schedule_algorithm, innodb_lock_schedule_algorithm " VATS" " use the Variance-Aware-Transaction-Scheduling algorithm, which" " uses an Eldest-Transaction-First heuristic.", - NULL, NULL, INNODB_LOCK_SCHEDULE_ALGORITHM_VATS, + NULL, NULL, INNODB_LOCK_SCHEDULE_ALGORITHM_FCFS, &innodb_lock_schedule_algorithm_typelib); static MYSQL_SYSVAR_ULONG(buffer_pool_instances, srv_buf_pool_instances,