~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/change_schema.cc

  • Committer: Monty Taylor
  • Date: 2010-11-08 18:26:08 UTC
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: mordred@inaugust.com-20101108182608-lci86acl7r53sbi3
Replaced auto_ptr with scoped_ptr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
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/change_schema.h>
25
 
#include <drizzled/schema.h>
 
25
#include <drizzled/db.h>
26
26
 
27
27
#include <string>
28
28
 
33
33
 
34
34
bool statement::ChangeSchema::execute()
35
35
{
36
 
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
 
36
  Select_Lex *select_lex= &session->lex->select_lex;
37
37
 
38
 
  identifier::Schema identifier(select_lex->db);
39
 
  if (not schema::change(*getSession(), identifier))
 
38
  SchemaIdentifier identifier(select_lex->db);
 
39
  if (not mysql_change_db(session, identifier))
40
40
  {
41
 
    getSession()->my_ok();
 
41
    session->my_ok();
42
42
  }
43
43
 
44
44
  return false;