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

Merge branch 'QA_4_4'

Browse Source
This commit is contained in:
Marc Delisle 2015-03-24 13:28:08 -04:00
commit 103d226016
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
+ rfe #947 Show edit/delete also when there is calculated column
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

10
libraries/server_privileges.lib.php
View File

@ -4187,12 +4187,18 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
. __('Users overview') . "\n"
. '</h2>' . "\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'])

4
test/libraries/PMA_server_privileges_test.php
View File

@ -47,6 +47,10 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
define("PMA_MYSQL_VERSION_COMMENT", "MySQL");
}
if (!defined("PMA_MYSQL_VERSION_COMMENT")) {
define("PMA_MYSQL_VERSION_COMMENT", "MySQL");
}
//$_REQUEST
$_REQUEST['log'] = "index1";
$_REQUEST['pos'] = 3;