← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/update.cc

  • Committer: Brian Aker
  • Date: 2011-02-21 18:33:47 UTC
  • mto: (2187.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2188.
  • Revision ID: brian@tangent.org-20110221183347-37lw0bf0eizv0gxm
getLex() usage and fix for table_name creation during admin commands.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/update.cc
28
28
 
29
29
bool statement::Update::execute()
30
30
{
31
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
32
 
  TableList *all_tables= getSession()->lex->query_tables;
 
31
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
 
32
  TableList *all_tables= getSession()->getLex()->query_tables;
33
33
  assert(first_table == all_tables && first_table != 0);
34
 
  Select_Lex *select_lex= &getSession()->lex->select_lex;
35
 
  Select_Lex_Unit *unit= &getSession()->lex->unit;
 
34
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
 
35
  Select_Lex_Unit *unit= &getSession()->getLex()->unit;
36
36
  if (update_precheck(getSession(), all_tables))
37
37
  {
38
38
    return true;
42
42
  bool res= update_query(getSession(), 
43
43
                         all_tables,
44
44
                         select_lex->item_list,
45
 
                         getSession()->lex->value_list,
 
45
                         getSession()->getLex()->value_list,
46
46
                         select_lex->where,
47
47
                         select_lex->order_list.elements,
48
48
                         (Order *) select_lex->order_list.first,
49
49
                         unit->select_limit_cnt,
50
 
                         getSession()->lex->duplicates, 
51
 
                         getSession()->lex->ignore);
 
50
                         getSession()->getLex()->duplicates, 
 
51
                         getSession()->getLex()->ignore);
52
52
  return res;
53
53
}
54
54