Commit 11612dd3 authored by unknown's avatar unknown
Browse files

Should check for GEOM_FLAG later because keyX may be partly initialized (min_flag is not set).

parent 0eab587e

sql/opt_range.cc

+7 −6
Original line number Diff line number Diff line
@@ -1401,12 +1401,6 @@ key_and(SEL_ARG *key1,SEL_ARG *key2,uint clone_flag) 
    return key2;

  if (!key2)

    return key1;

  if ((key1->min_flag | key2->min_flag) & GEOM_FLAG)

  {

    key1->free_tree();

    key2->free_tree();

    return 0;					// Can't optimize this

  }

  if (key1->part != key2->part)

  {

    if (key1->part > key2->part)
@@ -1462,6 +1456,13 @@ key_and(SEL_ARG *key1,SEL_ARG *key2,uint clone_flag) 
    return key1;

  }



  if ((key1->min_flag | key2->min_flag) & GEOM_FLAG)

  {

    key1->free_tree();

    key2->free_tree();

    return 0;					// Can't optimize this

  }



  key1->use_count--;

  key2->use_count--;

  SEL_ARG *e1=key1->first(), *e2=key2->first(), *new_tree=0;