[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-457-g69fefac

[Michal Čihař]

The branch, master has been updated
       via  69fefacf1a841bf87453f76217944e3832af10e8 (commit)
       via  d0b9caa050a8f2e056998c67e9a1a7468def275a (commit)
       via  3c0fcf7ca145eda2d2cabfaff54b59dad7e043a7 (commit)
       via  c021d2f719d0c4af651232a393025cda24c6a91b (commit)
      from  7cf6efe1704684f9febeb5c995296df7008aadf5 (commit)


- Log -----------------------------------------------------------------
commit 69fefacf1a841bf87453f76217944e3832af10e8
Merge: 7cf6efe1704684f9febeb5c995296df7008aadf5 d0b9caa050a8f2e056998c67e9a1a7468def275a
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 16 16:20:14 2011 +0200

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index 83dd9e2..3492cd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
 - bug #3302457 Inline edit and $cfg['PropertiesIconic']
 - Patch #3302313 Show a translated label
 - bug #3300981 [navi] Table filter is case sensitive
+- bug #3285929 [privileges] Revert temporary fix
 
 3.4.0.0 (2011-05-11)
 + rfe #2890226 [view] Enable VIEW rename 
diff --git a/server_privileges.php b/server_privileges.php
index 9636f64..e2a930e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1158,7 +1158,7 @@ if (!empty($update_privs)) {
         }
         $sql_query2 .= ';';
     }
-    if (! PMA_DBI_query($sql_query0)) {
+    if (! PMA_DBI_try_query($sql_query0)) {
         // This might fail when the executing user does not have ALL PRIVILEGES himself. 
         // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=23067&atid=377408
         $sql_query0 = '';


hooks/post-receive
-- 
phpMyAdmin