← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2011-02-17 10:09:00 UTC
  • mfrom: (2173.2.1 clean-include-usuage)
  • Revision ID: brian@tangent.org-20110217100900-4tpuxxzdl1sj00sh
Merge Monty for headers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
15
15
 
16
16
 
17
17
/* Basic functions needed by many modules */
18
 
#include "config.h"
 
18
#include <config.h>
19
19
#include <assert.h>
20
20
 
21
21
#include <signal.h>
30
30
#  include <time.h>
31
31
# endif
32
32
#endif
33
 
#include "drizzled/internal/my_pthread.h"
34
 
#include "drizzled/internal/thread_var.h"
 
33
#include <drizzled/internal/my_pthread.h>
 
34
#include <drizzled/internal/thread_var.h>
35
35
 
36
36
#include <drizzled/sql_select.h>
37
37
#include <drizzled/error.h>
44
44
#include <drizzled/check_stack_overrun.h>
45
45
#include <drizzled/lock.h>
46
46
#include <drizzled/plugin/listen.h>
47
 
#include "drizzled/cached_directory.h"
 
47
#include <drizzled/cached_directory.h>
48
48
#include <drizzled/field/epoch.h>
49
49
#include <drizzled/field/null.h>
50
 
#include "drizzled/sql_table.h"
51
 
#include "drizzled/global_charset_info.h"
52
 
#include "drizzled/pthread_globals.h"
53
 
#include "drizzled/internal/iocache.h"
54
 
#include "drizzled/drizzled.h"
55
 
#include "drizzled/plugin/authorization.h"
56
 
#include "drizzled/table/temporary.h"
57
 
#include "drizzled/table/placeholder.h"
58
 
#include "drizzled/table/unused.h"
59
 
#include "drizzled/plugin/storage_engine.h"
 
50
#include <drizzled/sql_table.h>
 
51
#include <drizzled/global_charset_info.h>
 
52
#include <drizzled/pthread_globals.h>
 
53
#include <drizzled/internal/iocache.h>
 
54
#include <drizzled/drizzled.h>
 
55
#include <drizzled/plugin/authorization.h>
 
56
#include <drizzled/table/temporary.h>
 
57
#include <drizzled/table/placeholder.h>
 
58
#include <drizzled/table/unused.h>
 
59
#include <drizzled/plugin/storage_engine.h>
 
60
#include <drizzled/session.h>
60
61
 
61
62
#include <drizzled/refresh_version.h>
62
63
 
1598
1599
     * table/schema information via error messages
1599
1600
     */
1600
1601
    identifier::Table the_table(tables->getSchemaName(), tables->getTableName());
1601
 
    if (not plugin::Authorization::isAuthorized(user(), the_table))
 
1602
    if (not plugin::Authorization::isAuthorized(*user(), the_table))
1602
1603
    {
1603
1604
      result= -1;                               // Fatal error
1604
1605
      break;