← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
83
83
extern bool timed_mutexes;
84
84
 
85
85
extern struct option my_long_options[];
86
 
extern const CHARSET_INFO *character_set_filesystem;
 
86
extern const charset_info_st *character_set_filesystem;
87
87
extern size_t my_thread_stack_size;
88
88
 
89
89
typedef map<string, sys_var *> SystemVariableMap;
1066
1066
 
1067
1067
bool sys_var_collation_sv::update(Session *session, set_var *var)
1068
1068
{
1069
 
  const CHARSET_INFO *tmp;
 
1069
  const charset_info_st *tmp;
1070
1070
 
1071
1071
  if (var->value->result_type() == STRING_RESULT)
1072
1072
  {
1120
1120
                                               sql_var_t type,
1121
1121
                                               const LEX_STRING *)
1122
1122
{
1123
 
  const CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
 
1123
  const charset_info_st *cs= ((type == OPT_GLOBAL) ?
1124
1124
                           global_system_variables.*offset :
1125
1125
                           session->variables.*offset);
1126
1126
  return cs ? (unsigned char*) cs->name : (unsigned char*) "NULL";