← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/analyze.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/analyze.cc
29
29
 
30
30
bool statement::Analyze::execute()
31
31
{
32
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
33
 
  TableList *all_tables= getSession()->lex->query_tables;
 
32
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
 
33
  TableList *all_tables= getSession()->getLex()->query_tables;
34
34
  assert(first_table == all_tables && first_table != 0);
35
 
  Select_Lex *select_lex= &getSession()->lex->select_lex;
 
35
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
36
36
  bool res= analyze_table(getSession(), first_table, &check_opt);
37
37
  /* ! we write after unlocking the table */
38
38
  write_bin_log(getSession(), *getSession()->getQueryString());
39
39
  select_lex->table_list.first= (unsigned char*) first_table;
40
 
  getSession()->lex->query_tables= all_tables;
 
40
  getSession()->getLex()->query_tables= all_tables;
41
41
 
42
42
  return res;
43
43
}