← 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-08-03 10:04:55 UTC
  • mfrom: (2382 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2384.
  • Revision ID: olafvdspek@gmail.com-20110803100455-2oqzyi77v4gykhy0
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
29
29
 
30
30
Item_func_get_system_var::
31
31
Item_func_get_system_var(sys_var *var_arg, sql_var_t var_type_arg,
32
 
                       LEX_STRING *component_arg, const char *name_arg,
 
32
                       lex_string_t *component_arg, const char *name_arg,
33
33
                       size_t name_len_arg)
34
34
  :var(var_arg), var_type(var_type_arg), component(*component_arg)
35
35
{
57
57
  return 0;
58
58
}
59
59
 
60
 
Item *get_system_var(Session *session, sql_var_t var_type, LEX_STRING name,
61
 
                     LEX_STRING component)
 
60
Item *get_system_var(Session *session, sql_var_t var_type, lex_string_t name,
 
61
                     lex_string_t component)
62
62
{
63
63
  sys_var *var;
64
 
  LEX_STRING *base_name, *component_name;
 
64
  lex_string_t *base_name, *component_name;
65
65
 
66
66
  if (component.str)
67
67
  {