← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/get_system_var.cc

  • Committer: Olaf van der Spek
  • Date: 2011-10-30 12:41:04 UTC
  • mto: This revision was merged to the branch mainline in revision 2456.
  • Revision ID: olafvdspek@gmail.com-20111030124104-5unihy0pvv70thxk
Use union instead of struct for YYSTYPE
Use str_ref

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
28
28
namespace drizzled {
29
29
 
30
30
Item_func_get_system_var::Item_func_get_system_var(sys_var *var_arg, sql_var_t var_type_arg,
31
 
                       lex_string_t *component_arg, const char *name_arg, size_t name_len_arg)
32
 
  : var(var_arg), var_type(var_type_arg), component(*component_arg)
 
31
                       str_ref component_arg, const char *name_arg, size_t name_len_arg)
 
32
  : var(var_arg), var_type(var_type_arg), component(component_arg)
33
33
{
34
34
  /* set_name() will allocate the name */
35
35
  set_name(name_arg, name_len_arg);
54
54
  return 0;
55
55
}
56
56
 
57
 
Item *get_system_var(Session *session, sql_var_t var_type, lex_string_t name, lex_string_t component)
 
57
Item *get_system_var(Session *session, sql_var_t var_type, str_ref name, str_ref component)
58
58
{
59
 
  lex_string_t *base_name, *component_name;
 
59
  str_ref *base_name, *component_name;
60
60
 
61
61
  if (component.data())
62
62
  {
82
82
  if (component_name->size() > MAX_SYS_VAR_LENGTH)
83
83
    component_name->assign(component_name->data(), MAX_SYS_VAR_LENGTH);
84
84
 
85
 
  return new Item_func_get_system_var(var, var_type, component_name, NULL, 0);
 
85
  return new Item_func_get_system_var(var, var_type, *component_name, NULL, 0);
86
86
}
87
87
 
88
88