← 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-10-14 15:59:08 UTC
  • mfrom: (2430.1.12 refactor3a)
  • Revision ID: me@mark.atwood.name-20111014155908-whqmrmaf2grpsg5c
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
83
83
  }
84
84
  session->lex().setCacheable(false);
85
85
 
86
 
  set_if_smaller(component_name->length, (size_t)MAX_SYS_VAR_LENGTH);
 
86
  if (component_name->size() > MAX_SYS_VAR_LENGTH)
 
87
    component_name->assign(component_name->data(), MAX_SYS_VAR_LENGTH);
87
88
 
88
89
  return new Item_func_get_system_var(var, var_type, component_name, NULL, 0);
89
90
}