Commit 3bd26b47 authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B30355-5.0-opt
parents 11d268ba cbc91811

sql/opt_range.cc

+4 −1
Original line number Diff line number Diff line
@@ -250,6 +250,9 @@ class SEL_ARG :public Sql_alloc 
  Field *field;

  char *min_value,*max_value;			// Pointer to range



  /*

    eq_tree() requires that left == right == 0 if the type is MAYBE_KEY.

   */

  SEL_ARG *left,*right;   /* R-B tree children */

  SEL_ARG *next,*prev;    /* Links for bi-directional interval list */

  SEL_ARG *parent;        /* R-B tree parent */
@@ -265,7 +268,7 @@ class SEL_ARG :public Sql_alloc 
  SEL_ARG(Field *field, uint8 part, char *min_value, char *max_value,

	  uint8 min_flag, uint8 max_flag, uint8 maybe_flag);

  SEL_ARG(enum Type type_arg)

    :min_flag(0),elements(1),use_count(1),left(0),next_key_part(0),

    :min_flag(0),elements(1),use_count(1),left(0),right(0),next_key_part(0),

    color(BLACK), type(type_arg)

  {}

  inline bool is_same(SEL_ARG *arg)