← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: vjsamuel1990 at gmail
  • Date: 2011-02-04 18:26:39 UTC
  • mto: This revision was merged to the branch mainline in revision 2147.
  • Revision ID: vjsamuel1990@gmail.com-20110204182639-e8tbwkbdzdw86it6
Merge encapsulate join_read_const_table() into JoinTable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
67
67
 
68
68
namespace drizzled
69
69
{
70
 
 
71
70
extern plugin::StorageEngine *heap_engine;
72
71
 
73
72
/** Declarations of static functions used in this source file. */
5668
5667
    s= p_pos->getJoinTable();
5669
5668
    s->type= AM_SYSTEM;
5670
5669
    join->const_table_map|=s->table->map;
5671
 
    if ((tmp= join_read_const_table(s, p_pos)))
 
5670
    if ((tmp= s->join_read_const_table(p_pos)))
5672
5671
    {
5673
5672
      if (tmp > 0)
5674
5673
        return 1;                       // Fatal error
5742
5741
          join->const_table_map|=table->map;
5743
5742
          set_position(join, const_count++, s, (optimizer::KeyUse*) 0);
5744
5743
          partial_pos= join->getSpecificPosInPartialPlan(const_count - 1);
5745
 
          if ((tmp= join_read_const_table(s, partial_pos)))
 
5744
          if ((tmp= s->join_read_const_table(partial_pos)))
5746
5745
          {
5747
5746
            if (tmp > 0)
5748
5747
              return 1;                 // Fatal error
5794
5793
                if (create_ref_for_key(join, s, start_keyuse, found_const_table_map))
5795
5794
                  return 1;
5796
5795
                partial_pos= join->getSpecificPosInPartialPlan(const_count - 1);
5797
 
                if ((tmp=join_read_const_table(s, partial_pos)))
 
5796
                if ((tmp=s->join_read_const_table(partial_pos)))
5798
5797
                {
5799
5798
                  if (tmp > 0)
5800
5799
                    return 1;                   // Fatal error