← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/explain_plan.cc

  • Committer: Lee Bieber
  • Date: 2011-02-21 21:20:44 UTC
  • mfrom: (2187.1.2 build)
  • Revision ID: kalebral@gmail.com-20110221212044-x1j9pmv0230febuz
Merge Brian - getLex() usage and fix for table_name creation during admin commands.
Merge Olaf - Use List::begin() and Use List::iterator instead of List_iterator_fast

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/explain_plan.cc
99
99
    for (uint32_t i= 0; i < 7; i++)
100
100
      item_list.push_back(item_null);
101
101
 
102
 
    if (join->session->lex->describe & DESCRIBE_EXTENDED)
 
102
    if (join->session->getLex()->describe & DESCRIBE_EXTENDED)
103
103
      item_list.push_back(item_null);
104
104
 
105
105
    item_list.push_back(new Item_string(message,strlen(message),cs));
159
159
    /* ref */
160
160
    item_list.push_back(item_null);
161
161
    /* in_rows */
162
 
    if (join->session->lex->describe & DESCRIBE_EXTENDED)
 
162
    if (join->session->getLex()->describe & DESCRIBE_EXTENDED)
163
163
      item_list.push_back(item_null);
164
164
    /* rows */
165
165
    item_list.push_back(item_null);
314
314
                                       MY_INT64_NUM_DECIMAL_DIGITS));
315
315
 
316
316
      /* Add "filtered" field to item_list. */
317
 
      if (join->session->lex->describe & DESCRIBE_EXTENDED)
 
317
      if (join->session->getLex()->describe & DESCRIBE_EXTENDED)
318
318
      {
319
319
        float f= 0.0;
320
320
        if (examined_rows)
467
467
  {
468
468
    // drop UNCACHEABLE_EXPLAIN, because it is for internal usage only
469
469
    sl->uncacheable.reset(UNCACHEABLE_EXPLAIN);
470
 
    if (&session->lex->select_lex == sl)
 
470
    if (&session->getLex()->select_lex == sl)
471
471
    {
472
472
      if (sl->first_inner_unit() || sl->next_select())
473
473
      {
540
540
  }
541
541
  else
542
542
  {
543
 
    session->lex->current_select= first;
 
543
    session->getLex()->current_select= first;
544
544
    unit->set_limit(unit->global_parameters);
545
545
    res= select_query(session, 
546
546
                      &first->ref_pointer_array,