From: Date: December 15 2008 8:08pm
Subject: bzr push into mysql-6.0-bka-preview branch (sergefp:2679 to 2680)
List-Archive: http://lists.mysql.com/commits/61700
Message-Id: <20081215190800.6457D15A291@pslp2.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

 2680 Sergey Petrunia	2008-12-15
      Fix (harmless) valgrind failure: check found_records before touching found_read_time
modified:
  sql/opt_range.cc

 2679 Sergey Petrunia	2008-12-13
      * Ignore libmysqld/sql_join_cache.cc
      * Post-merge fix: put mysql-test-run's $opt_suites_default back to its default setting
modified:
  .bzrignore
  mysql-test/mysql-test-run.pl

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2008-12-13 11:02:16 +0000
+++ b/sql/opt_range.cc	2008-12-15 19:06:26 +0000
@@ -4827,7 +4827,7 @@ static TRP_RANGE *get_key_scans_params(P
         tree->n_ror_scans++;
         tree->ror_scans_map.set_bit(idx);
       }
-      if (read_time > found_read_time && found_records != HA_POS_ERROR)
+      if (found_records != HA_POS_ERROR && read_time > found_read_time)
       {
         read_time=    found_read_time;
         best_records= found_records;