← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/columns.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/columns.cc
62
62
  column_iterator(0),
63
63
  is_columns_primed(false)
64
64
{
65
 
  Session *session= current_session;
66
 
  drizzled::statement::Select *select= static_cast<statement::Select *>(session->lex->statement);
67
 
 
68
 
  setSchemaPredicate(select->getShowSchema());
69
 
  setTablePredicate(select->getShowTable());
70
65
}
71
66
 
72
67