From 8ac8fb11136caf18769b3fbdb5889e3e011331a5 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 21 Aug 2008 16:55:31 +0000
Subject: [PATCH] bug #2063100 Unknown column Event_priv

---
 server_privileges.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 686461d084..a4ddbb2dd0 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1959,9 +1959,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         . '`Show_view_priv`, '
         . '`Create_routine_priv`, '
         . '`Alter_routine_priv`, '
-        . '`Execute_priv`, '
-        . '`Event_priv`, '
-        . '`Trigger_priv`';
+        . '`Execute_priv`';
 
     $list_of_compared_privileges =
         '`Select_priv` = \'N\''
@@ -1978,9 +1976,16 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         . ' 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\'';
+        . ' AND `Execute_priv` = \'N\'';
+
+    if (PMA_MYSQL_INT_VERSION >= 50106) {
+        $list_of_privileges .=
+            ', `Event_priv`, '
+            . '`Trigger_priv`';
+        $list_of_compared_privileges .=
+            ' AND `Event_priv` = \'N\''
+            . ' AND `Trigger_priv` = \'N\'';
+    }
 
     $sql_query =
         '(SELECT ' . $list_of_privileges . ', `Db`'
-- 
2.11.4.GIT