← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-187

« back to all changes in this revision

Viewing changes to drizzled/statement/change_schema.cc

  • Committer: Stewart Smith
  • Date: 2012-07-11 14:06:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2574.
  • Revision ID: stewart@flamingspork.com-20120711140600-oxrs1cjabjuqpd05
force a identifier::Schema to be constructed with a identifier::Catalog. This is close to the final 'big' part for CATALOG support. We also have to modify all around the server that creates identifier::Schema so it does so properly. Since a single Session cannot span schemas, we get off a wee bit easy :) The big limitation in this patch is that INFORMATION_SCHEMA and DATA_DICTIONARY only appear in the LOCAL catalog (and this really needs to be fixed before CATALOGs other than LOCAL are supported).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/change_schema.cc
24
24
#include <drizzled/statement/change_schema.h>
25
25
#include <drizzled/schema.h>
26
26
#include <drizzled/sql_lex.h>
 
27
#include <drizzled/catalog/instance.h>
27
28
 
28
29
#include <string>
29
30
 
33
34
 
34
35
bool statement::ChangeSchema::execute()
35
36
{
36
 
  identifier::Schema identifier(str_ref(lex().select_lex.db));
 
37
  identifier::Schema identifier(session().catalog().identifier(),
 
38
                                str_ref(lex().select_lex.db));
37
39
  if (not schema::change(session(), identifier))
38
40
  {
39
41
    session().my_ok();