← 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: Brian Aker
  • Date: 2009-08-03 15:48:31 UTC
  • mfrom: (1106.4.3 no-multi-keycache)
  • mto: This revision was merged to the branch mainline in revision 1108.
  • Revision ID: brian@gaz-20090803154831-fngxv9aby0rjkyn9
Merge in removal of multi-keycache code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
73
73
    return 0;
74
74
  if (component.str)
75
75
  {
76
 
    if (!var->is_struct())
77
 
    {
78
 
      my_error(ER_VARIABLE_IS_NOT_STRUCT, MYF(0), base_name->str);
79
 
      return 0;
80
 
    }
 
76
    my_error(ER_VARIABLE_IS_NOT_STRUCT, MYF(0), base_name->str);
 
77
    return 0;
81
78
  }
82
79
 
83
80
  set_if_smaller(component_name->length, (size_t)MAX_SYS_VAR_LENGTH);