From 42c16de54c328b4b1b0225a104adb7a110bb114c Mon Sep 17 00:00:00 2001 From: Jellyfrog Date: Sun, 6 Mar 2022 19:52:50 +0100 Subject: [PATCH] Fix tests for MariaDB > 10.5.15 (#13829) --- tests/DBSetupTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/DBSetupTest.php b/tests/DBSetupTest.php index dd40e4901a..717db369e7 100644 --- a/tests/DBSetupTest.php +++ b/tests/DBSetupTest.php @@ -114,7 +114,9 @@ class DBSetupTest extends DBTestCase $mode = $result->mode; // NO_AUTO_CREATE_USER is removed in mysql 8 - $expected = ($vendor !== 'MariaDB' && version_compare($version, '8.0.0') >= 0) + $expected = ( + ($vendor !== 'MariaDB' && version_compare($version, '8.0.0') >= 0) || + ($vendor == 'MariaDB' && version_compare($version, '10.5.15') >= 0)) ? 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' : 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';