[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2473-gab57b74

[Marc Delisle]

The branch, master has been updated
       via  ab57b74d4094a6b4a41ff85ce50715b64ee2deea (commit)
      from  08892388fe88d5fcd57d2aa079a5cd93851ccdd9 (commit)


- Log -----------------------------------------------------------------
commit ab57b74d4094a6b4a41ff85ce50715b64ee2deea
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon May 3 07:35:37 2010 -0400

    similar messages had been merged

-----------------------------------------------------------------------

Summary of changes:
 server_privileges.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 78f7d90..a1481bf 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -480,7 +480,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE)
             array('Show_view', 'SHOW VIEW', $GLOBALS['strPrivDescShowView']),
             array('Create_routine', 'CREATE ROUTINE', $GLOBALS['strPrivDescCreateRoutine']),
             array('Alter_routine', 'ALTER ROUTINE', $GLOBALS['strPrivDescAlterRoutine']),
-            array('Execute', 'EXECUTE', $GLOBALS['strPrivDescExecute5']),
+            array('Execute', 'EXECUTE', $GLOBALS['strPrivDescExecute']),
         );
         // this one is for a db-specific priv: Create_view_priv
         if (isset($row['Create_view_priv'])) {


hooks/post-receive
-- 
phpMyAdmin