From 4d99680147dcdfa810fa228559ff0d04e86c4418 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Thu, 29 Oct 2020 09:23:38 -0400 Subject: [PATCH] Force BINARY comparison when looking at privileges. Otherwise, a mismatch between the "Server connection collation" dropdown and the system tables/views causes an error message. Fixes: #15463 Signed-off-by: Isaac Bennetch --- libraries/classes/Server/Privileges.php | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 24fd4d716f..1b9c0d9eab 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -1423,23 +1423,23 @@ class Privileges `Event_priv`, `Trigger_priv`,'; - $listOfComparedPrivileges = '`Select_priv` = \'N\' AND - `Insert_priv` = \'N\' AND - `Update_priv` = \'N\' AND - `Delete_priv` = \'N\' AND - `Create_priv` = \'N\' AND - `Drop_priv` = \'N\' AND - `Grant_priv` = \'N\' AND - `References_priv` = \'N\' AND - `Create_tmp_table_priv` = \'N\' AND - `Lock_tables_priv` = \'N\' AND - `Create_view_priv` = \'N\' AND - `Show_view_priv` = \'N\' AND - `Create_routine_priv` = \'N\' AND - `Alter_routine_priv` = \'N\' AND - `Execute_priv` = \'N\' AND - `Event_priv` = \'N\' AND - `Trigger_priv` = \'N\''; + $listOfComparedPrivileges = 'BINARY `Select_priv` = \'N\' AND + BINARY `Insert_priv` = \'N\' AND + BINARY `Update_priv` = \'N\' AND + BINARY `Delete_priv` = \'N\' AND + BINARY `Create_priv` = \'N\' AND + BINARY `Drop_priv` = \'N\' AND + BINARY `Grant_priv` = \'N\' AND + BINARY `References_priv` = \'N\' AND + BINARY `Create_tmp_table_priv` = \'N\' AND + BINARY `Lock_tables_priv` = \'N\' AND + BINARY `Create_view_priv` = \'N\' AND + BINARY `Show_view_priv` = \'N\' AND + BINARY `Create_routine_priv` = \'N\' AND + BINARY `Alter_routine_priv` = \'N\' AND + BINARY `Execute_priv` = \'N\' AND + BINARY `Event_priv` = \'N\' AND + BINARY `Trigger_priv` = \'N\''; $query = ' (