← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sel_imerge.h

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sel_imerge.h
60
60
     0 - OK
61
61
     -1 - Out of memory.
62
62
   */
63
 
  int or_sel_tree(RangeParameter *param, SEL_TREE *tree);
 
63
  void or_sel_tree(RangeParameter *param, SEL_TREE *tree);
64
64
 
65
65
  /*
66
66
     Perform OR operation on this SEL_IMERGE and supplied optimizer::SEL_TREE new_tree,
91
91
     and (*this) should be discarded.
92
92
     -1  An error occurred.
93
93
   */
94
 
  int or_sel_tree_with_checks(optimizer::RangeParameter *param, optimizer::SEL_TREE *new_tree);
 
94
  int or_sel_tree_with_checks(RangeParameter&, SEL_TREE&);
95
95
 
96
96
  /*
97
97
     Perform OR operation on this index_merge and supplied index_merge list.
102
102
     should be discarded.
103
103
     -1 - An error occurred
104
104
   */
105
 
  int or_sel_imerge_with_checks(optimizer::RangeParameter *param, SEL_IMERGE* imerge);
 
105
  int or_sel_imerge_with_checks(RangeParameter&, SEL_IMERGE&);
106
106
 
107
107
};
108
108