From 051b553ddede2b60f473995d3c89fdf55a043d78 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 15 Feb 2013 12:34:18 -0500 Subject: [PATCH] Bug #3828 MariaDB reported as MySQL --- ChangeLog | 1 + libraries/common.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bd2d4ecafd..8a241cb36d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 376b6a7e95..ece3c60201 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -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';