← 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: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
72
72
    component_name= &component;                 // Empty string
73
73
  }
74
74
 
75
 
  if (!(var= find_sys_var(base_name->str, base_name->length)))
 
75
  if (!(var= find_sys_var(session, base_name->str, base_name->length)))
76
76
    return 0;
77
77
  if (component.str)
78
78
  {
79
79
    my_error(ER_VARIABLE_IS_NOT_STRUCT, MYF(0), base_name->str);
80
80
    return 0;
81
81
  }
82
 
  session->lex->setCacheable(false);
83
82
 
84
83
  set_if_smaller(component_name->length, (size_t)MAX_SYS_VAR_LENGTH);
85
84