Merge remote-tracking branch 'origin/master'

2011-09-29 18:40:18 +02:00 · 2011-09-29 18:40:18 +02:00 · fef3a1aac7
commit fef3a1aac7
parent 9f0dc82af0 abe93510a2
1 changed files with 1 additions and 0 deletions
--- a/sql.php
+++ b/sql.php
@ -482,6 +482,7 @@ if (strlen($db)) {
 if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
    unset($result);
    $num_rows = 0;
+    $unlim_num_rows = 0;
 } else {
    if (isset($_SESSION['profiling']) && PMA_profilingSupported()) {
        PMA_DBI_query('SET PROFILING=1;');