← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/replace_select.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/replace_select.cc
30
30
 
31
31
bool statement::ReplaceSelect::execute()
32
32
{
33
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
34
 
  TableList *all_tables= getSession()->lex->query_tables;
 
33
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
 
34
  TableList *all_tables= getSession()->getLex()->query_tables;
35
35
  assert(first_table == all_tables && first_table != 0);
36
 
  Select_Lex *select_lex= &getSession()->lex->select_lex;
37
 
  Select_Lex_Unit *unit= &getSession()->lex->unit;
 
36
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
 
37
  Select_Lex_Unit *unit= &getSession()->getLex()->unit;
38
38
  select_result *sel_result= NULL;
39
39
  bool res;
40
40
 
63
63
    res= insert_select_prepare(getSession());
64
64
    if (! res && (sel_result= new select_insert(first_table,
65
65
                                                first_table->table,
66
 
                                                &getSession()->lex->field_list,
67
 
                                                &getSession()->lex->update_list,
68
 
                                                &getSession()->lex->value_list,
69
 
                                                getSession()->lex->duplicates,
70
 
                                                getSession()->lex->ignore)))
 
66
                                                &getSession()->getLex()->field_list,
 
67
                                                &getSession()->getLex()->update_list,
 
68
                                                &getSession()->getLex()->value_list,
 
69
                                                getSession()->getLex()->duplicates,
 
70
                                                getSession()->getLex()->ignore)))
71
71
    {
72
72
      res= handle_select(getSession(),
73
 
                         getSession()->lex,
 
73
                         getSession()->getLex(),
74
74
                         sel_result,
75
75
                         OPTION_SETUP_TABLES_DONE);
76
76
      /*