← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/analyze.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/analyze.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/statement/analyze.h>
25
 
#include "drizzled/sql_table.h"
 
25
#include <drizzled/sql_table.h>
 
26
#include <drizzled/sql_lex.h>
26
27
 
27
 
namespace drizzled
28
 
{
 
28
namespace drizzled {
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 *) lex().select_lex.table_list.first;
 
33
  TableList *all_tables= lex().query_tables;
34
34
  assert(first_table == all_tables && first_table != 0);
35
 
  Select_Lex *select_lex= &getSession()->lex->select_lex;
36
 
  bool res= analyze_table(getSession(), first_table, &check_opt);
37
 
  /* ! we write after unlocking the table */
38
 
  write_bin_log(getSession(), *getSession()->getQueryString());
 
35
  Select_Lex *select_lex= &lex().select_lex;
 
36
  bool res= analyze_table(&session(), first_table);
39
37
  select_lex->table_list.first= (unsigned char*) first_table;
40
 
  getSession()->lex->query_tables= all_tables;
41
 
 
 
38
  lex().query_tables= all_tables;
42
39
  return res;
43
40
}
44
41