~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2011-01-13 02:08:31 UTC
  • mto: (2079.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110113020831-gionzccgg17efwn7
Basic DDL for catalog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
54
54
#include <drizzled/item/null.h>
55
55
#include <drizzled/temporal.h>
56
56
 
57
 
#include "drizzled/table/singular.h"
 
57
#include "drizzled/table/instance.h"
58
58
 
59
59
#include "drizzled/table_proto.h"
60
60
 
333
333
    true ok
334
334
*/
335
335
 
336
 
bool check_db_name(Session *session, identifier::Schema &schema_identifier)
 
336
bool check_db_name(Session *session, SchemaIdentifier &schema_identifier)
337
337
{
338
338
  if (not plugin::Authorization::isAuthorized(session->user(), schema_identifier))
339
339
  {
838
838
    copy_func_count+= param->sum_func_count;
839
839
  }
840
840
 
841
 
  table::Singular *table;
 
841
  table::Instance *table;
842
842
  table= session->getInstanceTable(); // This will not go into the tableshare cache, so no key is used.
843
843
 
844
844
  if (not table->getMemRoot()->multi_alloc_root(0,