File tree 3 files changed +22
-2
lines changed
3 files changed +22
-2
lines changed Original file line number Diff line number Diff line change @@ -17,6 +17,12 @@ matrix:
17
17
- env :
18
18
- DB=mariadb:5.5
19
19
php : " 7.1"
20
+ - env :
21
+ - DB=mariadb:10.0
22
+ php : " 7.1"
23
+ - env :
24
+ - DB=mariadb:10.1
25
+ php : " 7.1"
20
26
- env :
21
27
- DB=mysql:5.5
22
28
php : " 7.1"
@@ -33,6 +39,12 @@ matrix:
33
39
- env :
34
40
- DB=mariadb:5.5
35
41
php : " 7.2"
42
+ - env :
43
+ - DB=mariadb:10.0
44
+ php : " 7.2"
45
+ - env :
46
+ - DB=mariadb:10.1
47
+ php : " 7.2"
36
48
- env :
37
49
- DB=mysql:5.5
38
50
php : " 7.2"
Original file line number Diff line number Diff line change @@ -35,7 +35,8 @@ Compatibility (based on integration tests)
35
35
- mysql 5.7
36
36
- mysql 8.0 (ONLY with mysql_native_password)
37
37
- mariadb 5.5
38
- - mariadb 10.0 (partaily, problem with some cases of TIMESTAMP)
38
+ - mariadb 10.0
39
+ - mariadb 10.1
39
40
- probably percona versions as is based on native mysql
40
41
41
42
MySQL server settings
Original file line number Diff line number Diff line change @@ -268,7 +268,14 @@ public function shouldBeTimestamp(): void
268
268
*/
269
269
public function shouldBeTimestampMySQL56 (): void
270
270
{
271
- if ($ this ->checkForVersion (5.6 )) {
271
+ /*
272
+ * https://mariadb.com/kb/en/library/microseconds-in-mariadb/
273
+ * MySQL 5.6 introduced microseconds using a slightly different implementation to MariaDB 5.3.
274
+ * Since MariaDB 10.1, MariaDB has defaulted to the MySQL format ...
275
+ */
276
+ if (BinLogServerInfo::isMariaDb () && $ this ->checkForVersion (10.1 )) {
277
+ $ this ->markTestIncomplete ('Only for mariadb 10.1 or higher ' );
278
+ } elseif ($ this ->checkForVersion (5.6 )) {
272
279
$ this ->markTestIncomplete ('Only for mysql 5.6 or higher ' );
273
280
}
274
281
You can’t perform that action at this time.
0 commit comments