~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/check.cc

  • Committer: Olaf van der Spek
  • Date: 2011-10-10 09:27:50 UTC
  • mto: (2430.1.6 rf)
  • mto: This revision was merged to the branch mainline in revision 2436.
  • Revision ID: olafvdspek@gmail.com-20111010092750-ryxgmn7zj5yvxfkf
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
#include <drizzled/sql_lex.h>
26
27
 
27
 
namespace drizzled
28
 
{
 
28
namespace drizzled {
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 *) 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= &session->lex->select_lex;
36
 
  bool res= mysql_check_table(session, first_table, &check_opt);
37
 
  select_lex->table_list.first= (unsigned char*) first_table;
38
 
  session->lex->query_tables=all_tables;
 
35
  bool res= check_table(&session(), first_table);
 
36
  lex().select_lex.table_list.first= (unsigned char*) first_table;
 
37
  lex().query_tables=all_tables;
39
38
  return res;
40
39
}
41
40
 
42
41
} /* namespace drizzled */
43