← 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: 2011-02-12 10:06:03 UTC
  • mfrom: (2154.2.16 drizzle-build)
  • Revision ID: brian@tangent.org-20110212100603-i5ww0s02p8l4a8q7
Merge in solaris tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
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