← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/key_field.cc

  • Committer: Brian Aker
  • Date: 2010-06-28 16:57:19 UTC
  • mfrom: (1637.2.9 convert-TableList)
  • Revision ID: brian@gaz-20100628165719-rpgaxo0hk055r5ct
Merge in VJ

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/key_field.cc
74
74
                                      uint32_t *and_level,
75
75
                                      vector<optimizer::SargableParam> &sargables)
76
76
{
77
 
  List_iterator<TableList> li(nested_join_table->nested_join->join_list);
78
 
  List_iterator<TableList> li2(nested_join_table->nested_join->join_list);
 
77
  List_iterator<TableList> li(nested_join_table->getNestedJoin()->join_list);
 
78
  List_iterator<TableList> li2(nested_join_table->getNestedJoin()->join_list);
79
79
  bool have_another= false;
80
80
  table_map tables= 0;
81
81
  TableList *table;
82
 
  assert(nested_join_table->nested_join);
 
82
  assert(nested_join_table->getNestedJoin());
83
83
 
84
84
  while ((table= li++) || (have_another && (li=li2, have_another=false,
85
85
                                            (table= li++))))
86
86
  {
87
 
    if (table->nested_join)
 
87
    if (table->getNestedJoin())
88
88
    {
89
89
      if (! table->on_expr)
90
90
      {
91
91
        /* It's a semi-join nest. Walk into it as if it wasn't a nest */
92
92
        have_another= true;
93
93
        li2= li;
94
 
        li= List_iterator<TableList>(table->nested_join->join_list);
 
94
        li= List_iterator<TableList>(table->getNestedJoin()->join_list);
95
95
      }
96
96
      else
97
97
        add_key_fields_for_nj(join, table, end, and_level, sargables);