diff --git a/ChangeLog b/ChangeLog
index 7b098d531..708e0e675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2121287 [display] Drop-down menu blinking in FF
 + [lang] Catalan update, thanks to Xavier Navarro
 + [lang] Finnish update, thanks to Jouni Kahkonen
+- [core] Avoid error with BLOBstreaming support requiring SUPER privilege 
 
 3.1.0.0 (2008-11-28)
 + [auth] Support for Swekey hardware authentication,
diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php
index d8616e9ff..d62e0c62f 100644
--- a/libraries/blobstreaming.lib.php
+++ b/libraries/blobstreaming.lib.php
@@ -95,7 +95,8 @@ function checkBLOBStreamingPlugins()
 
         // switch on BS field references
         if (strtolower($bs_variables[$PMA_Config->get('PBMS_NAME') . '_field_references']) == "off")
-            PMA_BS_SetFieldReferences('ON');
+            if(!PMA_BS_SetFieldReferences('ON'))
+		    return FALSE;
 
         // get BS server port
         $BS_PORT = $bs_variables[$PMA_Config->get('PBMS_NAME') . '_port'];
@@ -437,10 +438,13 @@ function PMA_BS_SetFieldReferences($val)
 
     // set field references to value specified
     $query = "SET GLOBAL " . $PMA_Config->get('PBMS_NAME') . "_field_references=" . PMA_sqlAddslashes($val);
-    $result = PMA_DBI_query($query);
+    $result = PMA_DBI_try_query($query, null, 0);
+
+    // get last known error (if applicable)
+    PMA_DBI_getError();
 
     // return success of query execution
-    if ($result)
+    if ($result && 0 == $GLOBALS['errno'])
         return TRUE;
     else
         return FALSE;