← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2010-08-21 04:05:07 UTC
  • mfrom: (1685.8.2 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1726.
  • Revision ID: mordred@inaugust.com-20100821040507-49agnt9lqpj1abbd
Fixed crashing bug in optimizer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
2632
2632
       left_item->collation.collation == value->collation.collation))
2633
2633
  {
2634
2634
    Item *tmp=value->clone_item();
2635
 
    tmp->collation.set(right_item->collation);
2636
 
 
2637
2635
    if (tmp)
2638
2636
    {
 
2637
      tmp->collation.set(right_item->collation);
2639
2638
      session->change_item_tree(args + 1, tmp);
2640
2639
      func->update_used_tables();
2641
2640
      if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC) &&
2655
2654
            right_item->collation.collation == value->collation.collation))
2656
2655
  {
2657
2656
    Item *tmp= value->clone_item();
2658
 
    tmp->collation.set(left_item->collation);
2659
 
 
2660
2657
    if (tmp)
2661
2658
    {
 
2659
      tmp->collation.set(left_item->collation);
2662
2660
      session->change_item_tree(args, tmp);
2663
2661
      value= tmp;
2664
2662
      func->update_used_tables();