← 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: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems
 
4
 *  Copyright (C) 2008 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
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>
25
26
 
26
27
namespace drizzled
27
28
{
49
50
  */
50
51
  if (!(item= var->item(session, var_type, &component)))
51
52
    return(1);                             // Impossible
 
53
 
52
54
  item->set_name(name, 0, system_charset_info); // don't allocate a new name
53
55
  session->change_item_tree(ref, item);
54
56
 
72
74
    component_name= &component;                 // Empty string
73
75
  }
74
76
 
75
 
  if (!(var= find_sys_var(session, base_name->str, base_name->length)))
 
77
  if (!(var= find_sys_var(base_name->str)))
76
78
    return 0;
77
79
  if (component.str)
78
80
  {