List:Commits« Previous MessageNext Message »
From:Jorgen Loland Date:February 16 2012 3:15pm
Subject:bzr push into mysql-trunk branch (jorgen.loland:3909 to 3910) Bug#13354910
View as plain text  
 3910 Jorgen Loland	2012-02-16
      BUG#13354910 followup: add assertion that records_in_range()
      is not called for open ranges.

    modified:
      sql/handler.cc
      sql/opt_range.cc
 3909 Marko Mäkelä	2012-02-16 [merge]
      Merge mysql-5.5 to mysql-trunk.

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2012-02-02 16:56:36 +0000
+++ b/sql/handler.cc	2012-02-16 15:15:41 +0000
@@ -4617,6 +4617,7 @@ handler::multi_range_read_info_const(uin
     else
     {
       DBUG_EXECUTE_IF("crash_records_in_range", DBUG_SUICIDE(););
+      DBUG_ASSERT(min_endp || max_endp);
       if (HA_POS_ERROR == (rows= this->records_in_range(keyno, min_endp, 
                                                         max_endp)))
       {

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2012-02-09 17:07:12 +0000
+++ b/sql/opt_range.cc	2012-02-16 15:15:41 +0000
@@ -4825,6 +4825,7 @@ static double ror_scan_selectivity(const
                      rec_per_key[tuple_arg->part]))    // (3)
       {
         DBUG_EXECUTE_IF("crash_records_in_range", DBUG_SUICIDE(););
+        DBUG_ASSERT(min_range.length > 0);
         records= (table->file->
                   records_in_range(scan->keynr, &min_range, &max_range));
       }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jorgen.loland:3909 to 3910) Bug#13354910Jorgen Loland16 Feb