From 9f65021d1e5767dad8eec5722bb0dfaba48faecb Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 9 Sep 2014 09:21:27 -0400
Subject: [PATCH] Remove dead code

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/server_privileges.lib.php           | 13 +++++--------
 server_privileges.php                         |  1 -
 test/libraries/PMA_server_privileges_test.php |  3 +--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f8fdc752be..03d1ae4c36 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1674,15 +1674,14 @@ function PMA_updatePassword($err_url, $username, $hostname)
 /**
  * Revokes privileges and get message and SQL query for privileges revokes
  *
- * @param string $db_and_table wildcard Escaped database+table specification
- * @param string $dbname       database name
- * @param string $tablename    table name
- * @param string $username     username
- * @param string $hostname     host name
+ * @param string $dbname    database name
+ * @param string $tablename table name
+ * @param string $username  username
+ * @param string $hostname  host name
  *
  * @return array ($message, $sql_query)
  */
-function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
+function PMA_getMessageAndSqlQueryForPrivilegesRevoke($dbname,
     $tablename, $username, $hostname
 ) {
     $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
@@ -2672,7 +2671,6 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
     }
 
     $result = $GLOBALS['dbi']->query($sql_query);
-    $sql_query = '';
 
     while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
         if (isset($db_rights[$row[$dbOrTableName]])) {
@@ -4396,7 +4394,6 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query,
  */
 function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
 {
-    $sql_query = '';
     $create_user_real = 'CREATE USER \''
         . PMA_Util::sqlAddSlashes($username) . '\'@\''
         . PMA_Util::sqlAddSlashes($hostname) . '\'';
diff --git a/server_privileges.php b/server_privileges.php
index 08d4cb8816..901283ff95 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -223,7 +223,6 @@ if (! empty($_REQUEST['changeUserGroup']) && $cfgRelation['menuswork']
  */
 if (isset($_REQUEST['revokeall'])) {
     list ($message, $sql_query) = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
-        $db_and_table,
         (isset($dbname) ? $dbname : ''),
         (isset($tablename) ? $tablename : ''),
         $username, $hostname
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 82fff8cff2..2272c06c69 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -734,7 +734,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
     public function testPMAGetMessageAndSqlQueryForPrivilegesRevoke()
     {
         $dbname = 'pma_dbname';
-        $db_and_table = 'pma_dbname.pma_tablename';
         $username = 'pma_username';
         $hostname = 'pma_hostname';
         $tablename = 'pma_tablename';
@@ -747,7 +746,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $_POST['max_questions'] = 1000;
         list ($message, $sql_query)
             = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
-                $db_and_table, $dbname, $tablename, $username, $hostname
+                $dbname, $tablename, $username, $hostname
             );
 
         $this->assertEquals(