← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Mark Atwood
  • Date: 2011-10-25 19:08:35 UTC
  • mfrom: (2445.1.6 rf)
  • Revision ID: me@mark.atwood.name-20111025190835-g21cn911ypxjd5fi
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
1661
1661
          item= eq_item;
1662
1662
        }
1663
1663
 
1664
 
        if ((cs != ((Item_func *) item)->compare_collation()) || !cs->coll->propagate(cs, 0, 0))
 
1664
        if ((cs != ((Item_func *) item)->compare_collation()) || !cs->coll->propagate())
1665
1665
        {
1666
1666
          return false;
1667
1667
        }