diff --git a/ChangeLog b/ChangeLog
index d828e5859..335d2ecc2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-08-03 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    *  libraries/dbi/mysqli.dbi.lib.php PMA_DBI_try_query(): do not force
+       MYSQLI_USE_RESULT if not requested, makes PMA_DBI_num_rows() not to work
+
 2006-08-02 Marc Delisle  <lem9@users.sourceforge.net>
     ### 2.8.2.1 released from MAINT_2_8_2
 
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index c9d996aa7..436e17d02 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -155,7 +155,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0)
     } elseif ($options == ($options | PMA_DBI_QUERY_UNBUFFERED)) {
         $method = MYSQLI_USE_RESULT;
     } else {
-        $method = MYSQLI_USE_RESULT;
+        $method = 0;
     }
 
     if (empty($link)) {