← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/system_variables.h

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/system_variables.h
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#ifndef DRIZZLED_SYSTEM_VARIABLES_H
22
 
#define DRIZZLED_SYSTEM_VARIABLES_H
 
21
#pragma once
23
22
 
24
 
namespace drizzled
25
 
{
 
23
namespace drizzled {
26
24
 
27
25
struct drizzle_system_variables
28
26
{
29
 
  drizzle_system_variables()
30
 
  {}
31
27
  /*
32
28
    How dynamically allocated system variables are handled:
33
29
 
81
77
  plugin::StorageEngine *storage_engine;
82
78
 
83
79
  /* Only charset part of these variables is sensible */
84
 
  const CHARSET_INFO  *character_set_filesystem;
 
80
  const charset_info_st  *character_set_filesystem;
85
81
 
86
82
  /* Both charset and collation parts of these variables are important */
87
 
  const CHARSET_INFO    *collation_server;
 
83
  const charset_info_st *collation_server;
88
84
 
89
 
  inline const CHARSET_INFO  *getCollation(void) 
 
85
  inline const charset_info_st  *getCollation(void) 
90
86
  {
91
87
    return collation_server;
92
88
  }
93
89
 
94
90
  /* Locale Support */
95
91
  MY_LOCALE *lc_time_names;
96
 
 
97
 
  Time_zone *time_zone;
98
92
};
99
93
 
100
94
 
101
95
} /* namespace drizzled */
102
96
 
103
 
#endif /* DRIZZLED_SYSTEM_VARIABLES_H */