← 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: Mark Atwood
  • Date: 2011-11-22 17:04:41 UTC
  • mfrom: (2462.1.3 drizzle-include)
  • Revision ID: me@mark.atwood.name-20111122170441-5dehm0e0ax20z19b
merge lp:~brianaker/drizzle/fedora-16-fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
58
58
{
59
59
  str_ref *base_name, *component_name;
60
60
 
61
 
  if (component.empty())
 
61
  if (component.data())
 
62
  {
 
63
    base_name= &component;
 
64
    component_name= &name;
 
65
  }
 
66
  else
62
67
  {
63
68
    base_name= &name;
64
69
    component_name= &component;                 // Empty string
65
70
  }
66
 
  else
67
 
  {
68
 
    base_name= &component;
69
 
    component_name= &name;
70
 
  }
71
71
 
72
 
  sys_var *var= find_sys_var(*base_name);
 
72
  sys_var *var= find_sys_var(base_name->data());
73
73
  if (not var)
74
74
    return NULL;
75
 
  if (not component.empty())
 
75
  if (component.data())
76
76
  {
77
77
    my_error(ER_VARIABLE_IS_NOT_STRUCT, MYF(0), base_name->data());
78
78
    return NULL;