From 723758e33360916df852f4cdee827b816c5f02c7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 6 Sep 2007 16:02:59 +0000 Subject: [PATCH] Do not display "Your MySQL library..." if only the Z part of X.Y.Z version is different --- ChangeLog | 2 ++ main.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b287113b4..169417eaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1787522 [view] wrong choice in algorithm drop-down - bug #1777620 [GUI] Table Print preview: missing column header, thanks to Mario Rohkrämer +- Do not display "Your MySQL library..." if only the Z part of X.Y.Z version + is different 2.11.0.0 (2007-08-21) diff --git a/main.php b/main.php index 540157b43..2429e61d1 100644 --- a/main.php +++ b/main.php @@ -346,8 +346,9 @@ if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 50000) { /** * Warning about different MySQL library and server version + * (a difference on the third digit does not count) */ -if ($server > 0 && PMA_MYSQL_CLIENT_API !== PMA_MYSQL_INT_VERSION) { +if ($server > 0 && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3)) { echo '
' . PMA_sanitize(sprintf($strMysqlLibDiffersServerVersion, PMA_DBI_get_client_info(),