From 40406c5e7ec6673694e74331e6fd8df14d84abc3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 24 Mar 2015 13:26:51 -0400 Subject: [PATCH] bug #4813 MySQL 5.7.6 and the Users menu tab Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/server_privileges.lib.php | 10 ++++++++-- test/libraries/PMA_server_privileges_test.php | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28e1a50395..32027af72d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.4.1.0 (not yet released) +- bug #4813 MySQL 5.7.6 and the Users menu tab 4.4.0.0 (not yet released) + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index c056f8e4e6..aa43c4d19b 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -4163,12 +4163,18 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir) . __('Users overview') . "\n" . '' . "\n"; + $password_column = 'Password'; + if (PMA_Util::getServerType() == 'MySQL' + && PMA_MYSQL_INT_VERSION >= 50706 + ) { + $password_column = 'authentication_string'; + } // $sql_query is for the initial-filtered, // $sql_query_all is for counting the total no. of users $sql_query = $sql_query_all = 'SELECT *,' . - " IF(`Password` = _latin1 '', 'N', 'Y') AS 'Password'" . - ' FROM `mysql`.`user`'; + " IF(`" . $password_column . "` = _latin1 '', 'N', 'Y') AS 'Password'" . + ' FROM `mysql`.`user`'; $sql_query .= (isset($_REQUEST['initial']) ? PMA_rangeOfUsers($_REQUEST['initial']) diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index 8c346b1818..02d34cd94a 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -44,6 +44,10 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase define("PMA_USR_BROWSER_AGENT", "other"); } + if (!defined("PMA_MYSQL_VERSION_COMMENT")) { + define("PMA_MYSQL_VERSION_COMMENT", "MySQL"); + } + //$_REQUEST $_REQUEST['log'] = "index1"; $_REQUEST['pos'] = 3;