← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/analyze.cc

  • Committer: Brian Aker
  • Date: 2011-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

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