diff --git a/lib/sequel/adapters/shared/mysql.rb b/lib/sequel/adapters/shared/mysql.rb index a0b105383..966d8e1e8 100644 --- a/lib/sequel/adapters/shared/mysql.rb +++ b/lib/sequel/adapters/shared/mysql.rb @@ -926,9 +926,9 @@ def supports_returning?(type) (type == :insert && db.mariadb? && db.adapter_scheme != :jdbc) ? (db.server_version >= 100500) : false end - # MySQL 8+ supports SKIP LOCKED. + # MySQL 8+ and MariaDB 10.6+ support SKIP LOCKED. def supports_skip_locked? - !db.mariadb? && db.server_version >= 80000 + (!db.mariadb? && db.server_version >= 80000) || (db.mariadb? && db.server_version >= 100600) end # Check the database setting for whether fractional timestamps