diff --git a/ChangeLog b/ChangeLog
index 481ef50bf..1f2bfa47d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 2004-05-07 Garvin Hicking <pma@supergarv.de>
+    * libraries/display_tbl.lib.php, libraries/display_tbl_links.lib.php,
+      librarries/functions.js: RFE #856208 - Show (un)check all boxes
+      for query results.
     * tbl_create.php, tbl_addfield.php, tbl_properties.inc.php:
       RFE #949594 - Allow changing amount of columns for adding fields/
       creating table (without losing previous data)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index bf2ce54cf..032c95319 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -443,7 +443,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_query)
 function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $analyzed_sql = '')
 {
     global $lang, $convcharset, $server, $db, $table;
-    global $goto;
+    global $goto, $text_url;
     global $sql_query, $num_rows, $pos, $session_max_rows;
     global $vertical_display, $disp_direction, $repeat_cells, $highlight_columns;
     global $dontlimitchars;
@@ -1443,7 +1443,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
 
         if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
             $vertical_display['row_delete'][$row_no] .= '    <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
-                                                     .  '        <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
+                                                     .  '        <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
                                                      .  '    </td>' . "\n";
         } else {
             unset($vertical_display['row_delete'][$row_no]);
@@ -1681,7 +1681,7 @@ function PMA_displayVerticalTable()
 function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
 {
     global $lang, $server, $cfg, $db, $table;
-    global $goto;
+    global $goto, $text_url;
     global $sql_query, $num_rows, $unlim_num_rows, $pos, $fields_meta, $fields_cnt;
     global $vertical_display, $disp_direction, $repeat_cells, $highlight_columns;
     global $dontlimitchars;
@@ -1801,8 +1801,14 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
 
         $delete_text = $is_display['del_lnk'] == 'dr' ? $GLOBALS['strDelete'] : $GLOBALS['strKill'];
         $propicon = (string)$GLOBALS['cfg']['PropertiesIconic'];
-
-//        echo '&nbsp;&nbsp;&nbsp;<img src="./images/arrow_' . $GLOBALS['text_dir'] . '.gif" border="0" width="38" height="22" alt="' . $GLOBALS['strWithChecked'] . '" />';
+?>
+        &nbsp;&nbsp;<img src="./images/arrow_<?php echo $GLOBALS['text_dir']; ?>.gif" border="0" width="38" height="22" alt="<?php echo $GLOBALS['strWithChecked']; ?>" />
+        <a href="<?php echo $text_url . '&amp;checkall=1'; ?>" onclick="setCheckboxesRange('rowsDeleteForm', true, 'id_rows_to_delete', 0, '<?php echo $num_rows; ?>'); return false;">
+            <?php echo $GLOBALS['strCheckAll']; ?></a>
+        &nbsp;/&nbsp;
+        <a href="<?php echo $text_url; ?>" onclick="setCheckboxesRange('rowsDeleteForm', false, 'id_rows_to_delete', 0, '<?php echo $num_rows; ?>'); return false;">
+            <?php echo $GLOBALS['strUncheckAll']; ?></a>
+<?php
           echo '&nbsp;&nbsp;<i>' . $GLOBALS['strWithChecked'] . '</i>'. "\n";
 
         if ($cfg['PropertiesIconic']) {
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index 5484c3c2e..0ed9e0dcf 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -4,7 +4,7 @@
 
 if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
     echo '    <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
-       . '        <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
+       . '        <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
        . '    </td>' . "\n";
 }
 if (!empty($edit_url)) {
diff --git a/libraries/functions.js b/libraries/functions.js
index 28783e3f4..35bce3c5f 100644
--- a/libraries/functions.js
+++ b/libraries/functions.js
@@ -424,7 +424,7 @@ function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerCol
     } // end 3
 
     // 3.3 ... Opera changes colors set via HTML to rgb(r,g,b) format so fix it
-    if (currentColor.indexOf("rgb") >= 0) 
+    if (currentColor.indexOf("rgb") >= 0)
     {
         var rgbStr = currentColor.slice(currentColor.indexOf('(') + 1,
                                      currentColor.indexOf(')'));
@@ -646,6 +646,28 @@ function setCheckboxes(the_form, do_check)
     return true;
 } // end of the 'setCheckboxes()' function
 
+/**
+ * Checks/unchecks all rows
+ *
+ * @param   string   the form name
+ * @param   boolean  whether to check or to uncheck the element
+ * @param   string   basename of the element
+ * @param   integer  min element count
+ * @param   integer  max element count
+ *
+ * @return  boolean  always true
+ */
+function setCheckboxesRange(the_form, do_check, basename, min, max)
+{
+    for (var i = min; i < max; i++) {
+        if (typeof(document.forms[the_form].elements[basename + i]) != 'undefined') {
+            document.forms[the_form].elements[basename + i].checked = do_check;
+        }
+    }
+
+    return true;
+} // end of the 'setCheckboxesRange()' function
+
 
 /**
   * Checks/unchecks all options of a <select> element