← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/get_system_var.cc

Merge Stewart's dead code removal

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, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
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
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
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
 
 
27
 
namespace drizzled
28
 
{
29
25
 
30
26
Item_func_get_system_var::
31
 
Item_func_get_system_var(sys_var *var_arg, sql_var_t var_type_arg,
 
27
Item_func_get_system_var(sys_var *var_arg, enum_var_type var_type_arg,
32
28
                       LEX_STRING *component_arg, const char *name_arg,
33
29
                       size_t name_len_arg)
34
30
  :var(var_arg), var_type(var_type_arg), component(*component_arg)
50
46
  */
51
47
  if (!(item= var->item(session, var_type, &component)))
52
48
    return(1);                             // Impossible
53
 
 
54
49
  item->set_name(name, 0, system_charset_info); // don't allocate a new name
55
50
  session->change_item_tree(ref, item);
56
51
 
57
52
  return(0);
58
53
}
59
54
 
60
 
Item *get_system_var(Session *session, sql_var_t var_type, LEX_STRING name,
 
55
Item *get_system_var(Session *session, enum_var_type var_type, LEX_STRING name,
61
56
                     LEX_STRING component)
62
57
{
63
58
  sys_var *var;
74
69
    component_name= &component;                 // Empty string
75
70
  }
76
71
 
77
 
  if (!(var= find_sys_var(base_name->str)))
 
72
  if (!(var= find_sys_var(session, base_name->str, base_name->length)))
78
73
    return 0;
79
74
  if (component.str)
80
75
  {
81
76
    my_error(ER_VARIABLE_IS_NOT_STRUCT, MYF(0), base_name->str);
82
77
    return 0;
83
78
  }
84
 
  session->lex->setCacheable(false);
85
79
 
86
80
  set_if_smaller(component_name->length, (size_t)MAX_SYS_VAR_LENGTH);
87
81
 
89
83
                                      NULL, 0);
90
84
}
91
85
 
92
 
 
93
 
} /* namespace drizzled */