From ffdba90e9bd2c0f3a3e551d73ef458462523f2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 14 Jan 2016 09:29:37 +0100 Subject: [PATCH] Fix wrong merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/check_user_privileges.lib.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 81f78afecb..f3d96de104 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -287,17 +287,10 @@ if ($user == '@') { // MySQL is started with --skip-grant-tables $GLOBALS['db_to_create'] = ''; $GLOBALS['dbs_where_create_table_allowed'] = array('*'); $GLOBALS['dbs_to_test'] = false; - $GLOBALS['flush_priv'] = true; $GLOBALS['db_priv'] = true; $GLOBALS['col_priv'] = true; $GLOBALS['table_priv'] = true; $GLOBALS['proc_priv'] = true; } else { PMA_analyseShowGrant(); - - // Check if privileges to 'mysql'.col_privs, 'mysql'.db, - // 'mysql'.table_privs, 'mysql'.proc_privs and privileges for - // flushing the privileges are available - PMA_checkRequiredPrivilegesForFlushing(); - PMA_checkRequiredPrivilegesForAdjust(); }