← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Lee Bieber
  • Date: 2011-02-21 21:20:44 UTC
  • mfrom: (2187.1.2 build)
  • Revision ID: kalebral@gmail.com-20110221212044-x1j9pmv0230febuz
Merge Brian - getLex() usage and fix for table_name creation during admin commands.
Merge Olaf - Use List::begin() and Use List::iterator instead of List_iterator_fast

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
20
20
#ifndef DRIZZLED_SESSION_H
21
21
#define DRIZZLED_SESSION_H
22
22
 
 
23
#include <algorithm>
 
24
#include <bitset>
 
25
#include <boost/make_shared.hpp>
 
26
#include <boost/thread/condition_variable.hpp>
 
27
#include <boost/thread/mutex.hpp>
 
28
#include <boost/thread/shared_mutex.hpp>
 
29
#include <boost/thread/thread.hpp>
 
30
#include <map>
 
31
#include <netdb.h>
 
32
#include <string>
 
33
#include <sys/resource.h>
 
34
#include <sys/time.h>
 
35
 
 
36
#include <drizzled/catalog/instance.h>
 
37
#include <drizzled/catalog/local.h>
 
38
#include <drizzled/copy_info.h>
23
39
#include <drizzled/cursor.h>
24
40
#include <drizzled/diagnostics_area.h>
25
41
#include <drizzled/file_exchange.h>
 
42
#include <drizzled/ha_data.h>
26
43
#include <drizzled/identifier.h>
27
44
#include <drizzled/lex_column.h>
28
45
#include <drizzled/my_hash.h>
33
50
#include <drizzled/pthread_globals.h>
34
51
#include <drizzled/query_id.h>
35
52
#include <drizzled/resource_context.h>
 
53
#include <drizzled/session/property_map.h>
 
54
#include <drizzled/session/state.h>
 
55
#include <drizzled/session/table_messages.h>
 
56
#include <drizzled/session/transactions.h>
36
57
#include <drizzled/sql_error.h>
37
58
#include <drizzled/sql_lex.h>
38
59
#include <drizzled/sql_locale.h>
39
60
#include <drizzled/statistics_variables.h>
 
61
#include <drizzled/system_variables.h>
 
62
#include <drizzled/system_variables.h>
40
63
#include <drizzled/table_ident.h>
41
64
#include <drizzled/transaction_context.h>
42
65
#include <drizzled/util/storable.h>
43
66
#include <drizzled/var.h>
44
 
 
45
 
 
46
 
#include <netdb.h>
47
 
#include <sys/time.h>
48
 
#include <sys/resource.h>
49
 
 
50
 
#include <algorithm>
51
 
#include <bitset>
52
 
#include <map>
53
 
#include <string>
54
 
 
55
 
#include <drizzled/catalog/instance.h>
56
 
#include <drizzled/catalog/local.h>
57
 
 
58
 
#include <drizzled/copy_info.h>
59
 
#include <drizzled/ha_data.h>
60
 
#include <drizzled/session/property_map.h>
61
 
#include <drizzled/session/state.h>
62
 
#include <drizzled/session/table_messages.h>
63
 
#include <drizzled/session/transactions.h>
64
 
#include <drizzled/system_variables.h>
65
 
#include <drizzled/system_variables.h>
66
 
 
67
 
#include <boost/thread/thread.hpp>
68
 
#include <boost/thread/mutex.hpp>
69
 
#include <boost/thread/shared_mutex.hpp>
70
 
#include <boost/thread/condition_variable.hpp>
71
 
#include <boost/make_shared.hpp>
72
 
 
73
67
#include <drizzled/visibility.h>
74
68
 
75
69
#define MIN_HANDSHAKE_SIZE      6
219
213
   * @todo should be const
220
214
   */
221
215
  uint32_t id;
 
216
private:
222
217
  LEX *lex; /**< parse tree descriptor */
223
218
 
 
219
public:
224
220
  LEX *getLex() 
225
221
  {
226
222
    return lex;