← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugin/show_dictionary/show_create_table.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:
plugin/show_dictionary/show_create_table.cc
48
48
 
49
49
  if (not select.getShowTable().empty() && not select.getShowSchema().empty())
50
50
  {
51
 
    identifier::Table identifier(select.getShowSchema(), select.getShowTable());
 
51
    identifier::Table identifier(getSession().catalog().identifier(),
 
52
                                 select.getShowSchema(),
 
53
                                 select.getShowTable());
52
54
 
53
55
    if (not plugin::Authorization::isAuthorized(*getSession().user(),
54
56
                                            identifier, false))