← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/analyze.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

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>
26
 
#include <drizzled/sql_lex.h>
 
25
#include "drizzled/sql_table.h"
27
26
 
28
27
namespace drizzled
29
28
{
30
29
 
31
30
bool statement::Analyze::execute()
32
31
{
33
 
  TableList *first_table= (TableList *) lex().select_lex.table_list.first;
34
 
  TableList *all_tables= lex().query_tables;
 
32
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
 
33
  TableList *all_tables= getSession()->lex->query_tables;
35
34
  assert(first_table == all_tables && first_table != 0);
36
 
  Select_Lex *select_lex= &lex().select_lex;
37
 
  bool res= analyze_table(&session(), first_table, &check_opt);
 
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());
38
39
  select_lex->table_list.first= (unsigned char*) first_table;
39
 
  lex().query_tables= all_tables;
 
40
  getSession()->lex->query_tables= all_tables;
40
41
 
41
42
  return res;
42
43
}