gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #3828 MariaDB reported as MySQL

Browse Source
This commit is contained in:
Marc Delisle 2013-02-15 12:34:18 -05:00
parent 3b0323dda3
commit 051b553dde
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
3.5.8.0 (not yet released)
- bug #3828 MariaDB reported as MySQL
3.5.7.0 (2013-02-15)
- bug #3779 [core] Problem with backslash in enum fields

2
libraries/common.lib.php
View File

@ -3752,7 +3752,7 @@ function PMA_getServerType()
$server_type = 'MySQL';
if (PMA_DRIZZLE) {
$server_type = 'Drizzle';
} else if (strpos(PMA_MYSQL_STR_VERSION, 'mariadb') !== false) {
} else if (stripos(PMA_MYSQL_STR_VERSION, 'mariadb') !== false) {
$server_type = 'MariaDB';
} else if (stripos(PMA_MYSQL_VERSION_COMMENT, 'percona') !== false) {
$server_type = 'Percona Server';