← Back to team overview

maria-developers team mailing list archive

Rev 2734: Backport into MariaDB-5.2 the following: in file:///home/psergey/dev/maria-5.2-dsmrr/

 

At file:///home/psergey/dev/maria-5.2-dsmrr/

------------------------------------------------------------
revno: 2734
revision-id: psergey@xxxxxxxxxxxx-20091215145330-oqv8jlxh36sl863m
parent: psergey@xxxxxxxxxxxx-20091215071646-gbq7406d2xpopd82
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.2-dsmrr
timestamp: Tue 2009-12-15 17:53:30 +0300
message:
  Backport into MariaDB-5.2 the following:
  WL#2474 "Multi Range Read: Change the default MRR implementation to implement new MRR interface"
  WL#2475 "Batched range read functions for MyISAM/InnoDb"
          "Index condition pushdown for MyISAM/InnoDB"
  - Fix valgrind failures
=== modified file 'sql/handler.h'
--- a/sql/handler.h	2009-12-15 07:16:46 +0000
+++ b/sql/handler.h	2009-12-15 14:53:30 +0000
@@ -1381,7 +1381,9 @@
     ref_length(sizeof(my_off_t)),
     ft_handler(0), inited(NONE),
     locked(FALSE), implicit_emptied(0),
-    pushed_cond(0), next_insert_id(0), insert_id_for_cur_row(0),
+    pushed_cond(0), pushed_idx_cond(NULL),
+    pushed_idx_cond_keyno(MAX_KEY),
+    next_insert_id(0), insert_id_for_cur_row(0),
     auto_inc_intervals_count(0)
     {
       reset_statistics();