← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2010-03-04 20:00:00 UTC
  • mfrom: (1320.1.15 build)
  • Revision ID: brian@gaz-20100304200000-vk1jaxgf665smmv8
Merge Monty/Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
29
29
#include <drizzled/gettext.h>
30
30
 
31
31
#include "drizzled/plugin/transactional_storage_engine.h"
 
32
#include "drizzled/plugin/authorization.h"
32
33
#include <drizzled/nested_join.h>
33
34
#include <drizzled/sql_parse.h>
34
35
#include <drizzled/item/sum.h>
1943
1944
  char *name= org_name->str;
1944
1945
  uint32_t name_length= org_name->length;
1945
1946
 
 
1947
  if (not plugin::Authorization::isAuthorized(current_session->getSecurityContext(),
 
1948
                                              string(name, name_length)))
 
1949
  {
 
1950
    return 1;
 
1951
  }
 
1952
 
1946
1953
  if (!name_length || name_length > NAME_LEN || name[name_length - 1] == ' ')
1947
1954
    return 1;
1948
1955