← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-21 15:57:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2346.
  • Revision ID: olafvdspek@gmail.com-20110621155711-98dr7fyae01qdbu6
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.cc
2162
2162
      session->lex().current_select= save_select;
2163
2163
      return(join->error ? join->error : 1);
2164
2164
    }
2165
 
    if (save_join_if_explain())
2166
 
     return(1);
2167
 
 
 
2165
    save_join_if_explain();
2168
2166
    if (item->engine_changed)
2169
2167
    {
2170
2168
      return(1);
2244
2242
  return(0);
2245
2243
}
2246
2244
 
2247
 
bool 
2248
 
subselect_single_select_engine::save_join_if_explain()
 
2245
void subselect_single_select_engine::save_join_if_explain()
2249
2246
{
2250
2247
  /*
2251
2248
    Save this JOIN to join->tmp_join since the original layout will be
2277
2274
    select_lex->master_unit()->uncacheable.set(UNCACHEABLE_EXPLAIN);
2278
2275
    join->init_save_join_tab();
2279
2276
  }
2280
 
  return false; // return void
2281
2277
}
2282
2278
 
2283
2279
 
3175
3171
    if ((res= materialize_join->optimize()))
3176
3172
      goto err;
3177
3173
 
3178
 
    if (materialize_engine->save_join_if_explain())
3179
 
      goto err;
 
3174
    materialize_engine->save_join_if_explain();
3180
3175
 
3181
3176
    materialize_join->exec();
3182
3177
    if ((res= test(materialize_join->error || session->is_fatal_error)))