← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/delete.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/statement/delete.cc
31
31
bool statement::Delete::execute()
32
32
{
33
33
  DRIZZLE_DELETE_START(getSession()->getQueryString()->c_str());
34
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
35
 
  TableList *all_tables= getSession()->lex->query_tables;
36
 
  Select_Lex *select_lex= &getSession()->lex->select_lex;
37
 
  Select_Lex_Unit *unit= &getSession()->lex->unit;
 
34
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
 
35
  TableList *all_tables= getSession()->getLex()->query_tables;
 
36
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
 
37
  Select_Lex_Unit *unit= &getSession()->getLex()->unit;
38
38
  assert(first_table == all_tables && first_table != 0);
39
39
  assert(select_lex->offset_limit == 0);
40
40
  unit->set_limit(select_lex);