~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-12-26 03:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226031544-1cf3raipu53fnmyj
Through page.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#include <drizzled/error.h>
23
23
#include <drizzled/function/get_system_var.h>
24
24
#include <drizzled/session.h>
25
 
#include <drizzled/sys_var.h>
26
25
 
27
26
namespace drizzled
28
27
{
50
49
  */
51
50
  if (!(item= var->item(session, var_type, &component)))
52
51
    return(1);                             // Impossible
53
 
 
54
52
  item->set_name(name, 0, system_charset_info); // don't allocate a new name
55
53
  session->change_item_tree(ref, item);
56
54
 
74
72
    component_name= &component;                 // Empty string
75
73
  }
76
74
 
77
 
  if (!(var= find_sys_var(base_name->str)))
 
75
  if (!(var= find_sys_var(base_name->str, base_name->length)))
78
76
    return 0;
79
77
  if (component.str)
80
78
  {