~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/change_schema.cc

Merge Joe, plus I updated the tests.

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
33
33
 
34
34
bool statement::ChangeSchema::execute()
35
35
{
36
 
  Select_Lex *select_lex= &getSession()->lex->select_lex;
 
36
  Select_Lex *select_lex= &session->lex->select_lex;
37
37
 
38
 
  identifier::Schema identifier(select_lex->db);
39
 
  if (not change_db(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;