The branch, QA_3_4 has been updated via 3c0fcf7ca145eda2d2cabfaff54b59dad7e043a7 (commit) via c021d2f719d0c4af651232a393025cda24c6a91b (commit) from c1a1d0054ca74f2e4d955f9aa7ecd319eec1cb47 (commit) - Log ----------------------------------------------------------------- commit 3c0fcf7ca145eda2d2cabfaff54b59dad7e043a7 Merge: c021d2f719d0c4af651232a393025cda24c6a91b c1a1d0054ca74f2e4d955f9aa7ecd319eec1cb47 Author: Herman van Rink <rink@initfour.nl> Date: Mon May 16 14:52:22 2011 +0200 Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4 commit c021d2f719d0c4af651232a393025cda24c6a91b Author: Herman van Rink <rink@initfour.nl> Date: Mon May 16 14:51:42 2011 +0200 bug #3285929 [privileges] Revert temporary fix ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d28578e..9a429f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,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 8263dab..11714c4 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=2... $sql_query0 = ''; hooks/post-receive -- phpMyAdmin