← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.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/session.cc
21
21
 * @file Implementation of the Session class and API
22
22
 */
23
23
 
24
 
#include "config.h"
 
24
#include <config.h>
25
25
 
26
26
#include <drizzled/copy_field.h>
27
 
#include "drizzled/session.h"
28
 
#include "drizzled/session/cache.h"
29
 
#include "drizzled/error.h"
30
 
#include "drizzled/gettext.h"
31
 
#include "drizzled/query_id.h"
32
 
#include "drizzled/data_home.h"
33
 
#include "drizzled/sql_base.h"
34
 
#include "drizzled/lock.h"
35
 
#include "drizzled/item/cache.h"
36
 
#include "drizzled/item/float.h"
37
 
#include "drizzled/item/return_int.h"
38
 
#include "drizzled/item/empty_string.h"
39
 
#include "drizzled/show.h"
40
 
#include "drizzled/plugin/client.h"
41
 
#include "drizzled/plugin/scheduler.h"
42
 
#include "drizzled/plugin/authentication.h"
43
 
#include "drizzled/plugin/logging.h"
44
 
#include "drizzled/plugin/transactional_storage_engine.h"
45
 
#include "drizzled/plugin/query_rewrite.h"
46
 
#include "drizzled/probes.h"
47
 
#include "drizzled/table_proto.h"
48
 
#include "drizzled/db.h"
49
 
#include "drizzled/pthread_globals.h"
50
 
#include "drizzled/transaction_services.h"
51
 
#include "drizzled/drizzled.h"
 
27
#include <drizzled/session.h>
 
28
#include <drizzled/session/cache.h>
 
29
#include <drizzled/error.h>
 
30
#include <drizzled/gettext.h>
 
31
#include <drizzled/query_id.h>
 
32
#include <drizzled/data_home.h>
 
33
#include <drizzled/sql_base.h>
 
34
#include <drizzled/lock.h>
 
35
#include <drizzled/item/cache.h>
 
36
#include <drizzled/item/float.h>
 
37
#include <drizzled/item/return_int.h>
 
38
#include <drizzled/item/empty_string.h>
 
39
#include <drizzled/show.h>
 
40
#include <drizzled/plugin/client.h>
 
41
#include <drizzled/plugin/scheduler.h>
 
42
#include <drizzled/plugin/authentication.h>
 
43
#include <drizzled/plugin/logging.h>
 
44
#include <drizzled/plugin/transactional_storage_engine.h>
 
45
#include <drizzled/plugin/query_rewrite.h>
 
46
#include <drizzled/probes.h>
 
47
#include <drizzled/table_proto.h>
 
48
#include <drizzled/pthread_globals.h>
 
49
#include <drizzled/transaction_services.h>
 
50
#include <drizzled/drizzled.h>
 
51
#include <drizzled/select_to_file.h>
 
52
#include <drizzled/select_export.h>
 
53
#include <drizzled/select_dump.h>
 
54
#include <drizzled/select_subselect.h>
 
55
#include <drizzled/select_singlerow_subselect.h>
 
56
#include <drizzled/select_max_min_finder_subselect.h>
 
57
#include <drizzled/select_exists_subselect.h>
 
58
#include <drizzled/tmp_table_param.h>
 
59
#include <drizzled/internal_error_handler.h>
52
60
 
53
 
#include "drizzled/identifier.h"
 
61
#include <drizzled/identifier.h>
54
62
 
55
63
#include <drizzled/refresh_version.h>
56
64
 
57
 
#include "drizzled/table/singular.h"
58
 
 
59
 
#include "plugin/myisam/myisam.h"
60
 
#include "drizzled/internal/iocache.h"
61
 
#include "drizzled/internal/thread_var.h"
62
 
#include "drizzled/plugin/event_observer.h"
63
 
 
64
 
#include "drizzled/util/functors.h"
65
 
 
66
 
#include "drizzled/display.h"
 
65
#include <drizzled/table/singular.h>
 
66
 
 
67
#include <plugin/myisam/myisam.h>
 
68
#include <drizzled/internal/iocache.h>
 
69
#include <drizzled/internal/thread_var.h>
 
70
#include <drizzled/plugin/event_observer.h>
 
71
 
 
72
#include <drizzled/user_var_entry.h>
 
73
 
 
74
#include <drizzled/util/functors.h>
 
75
 
 
76
#include <drizzled/display.h>
67
77
 
68
78
#include <algorithm>
69
79
#include <climits>
73
83
#include <boost/filesystem.hpp>
74
84
#include <boost/checked_delete.hpp>
75
85
 
76
 
#include "drizzled/util/backtrace.h"
 
86
#include <drizzled/util/backtrace.h>
 
87
 
 
88
#include <drizzled/schema.h>
77
89
 
78
90
using namespace std;
79
91
 
306
318
  m_internal_handler= NULL;
307
319
}
308
320
 
309
 
void Session::get_xid(DRIZZLE_XID *xid)
 
321
void Session::get_xid(DrizzleXid *xid)
310
322
{
311
 
  *xid = *(DRIZZLE_XID *) &transaction.xid_state.xid;
 
323
  *xid = *(DrizzleXid *) &transaction.xid_state.xid;
312
324
}
313
325
 
314
326
/* Do operations that may take a long time */
587
599
*/
588
600
bool Session::isViewable(identifier::User::const_reference user_arg) const
589
601
{
590
 
  return plugin::Authorization::isAuthorized(user_arg, this, false);
 
602
  return plugin::Authorization::isAuthorized(user_arg, *this, false);
591
603
}
592
604
 
593
605
 
630
642
                        const std::string &in_db)
631
643
{
632
644
  bool is_authenticated=
633
 
    plugin::Authentication::isAuthenticated(user(), passwd_str);
 
645
    plugin::Authentication::isAuthenticated(*user(), passwd_str);
634
646
 
635
647
  if (is_authenticated != true)
636
648
  {
643
655
  if (not in_db.empty())
644
656
  {
645
657
    identifier::Schema identifier(in_db);
646
 
    if (change_db(this, identifier))
 
658
    if (schema::change(*this, identifier))
647
659
    {
648
660
      /* change_db() has pushed the error message. */
649
661
      return false;