← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/check.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 04:19:44 UTC
  • mto: (2192.1.1 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2193.
  • Revision ID: brian@tangent.org-20110222041944-furz1h252ecz7mpd
Merge in modifications such that we check both schema and table for
replication option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/check.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems
 
4
 *  Copyright (C) 2009 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
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/check.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::Check::execute()
31
31
{
32
 
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
33
 
  TableList *all_tables= session->lex->query_tables;
 
32
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
 
33
  TableList *all_tables= getSession()->lex->query_tables;
34
34
  assert(first_table == all_tables && first_table != 0);
35
 
  Select_Lex *select_lex= &session->lex->select_lex;
36
 
  bool res= mysql_check_table(session, first_table, &check_opt);
 
35
  Select_Lex *select_lex= &getSession()->lex->select_lex;
 
36
  bool res= check_table(getSession(), first_table, &check_opt);
37
37
  select_lex->table_list.first= (unsigned char*) first_table;
38
 
  session->lex->query_tables=all_tables;
 
38
  getSession()->lex->query_tables=all_tables;
 
39
 
39
40
  return res;
40
41
}
41
42