← 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
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
22
#include <drizzled/error.h>
23
23
#include <drizzled/function/get_system_var.h>
24
24
#include <drizzled/session.h>
25
25
#include <drizzled/sys_var.h>
26
 
#include <drizzled/sql_lex.h>
27
26
 
28
 
namespace drizzled {
 
27
namespace drizzled
 
28
{
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,
52
52
    return(1);                             // Impossible
53
53
 
54
54
  item->set_name(name, 0, system_charset_info); // don't allocate a new name
55
 
  *ref= item;
 
55
  session->change_item_tree(ref, item);
56
56
 
57
57
  return(0);
58
58
}
81
81
    my_error(ER_VARIABLE_IS_NOT_STRUCT, MYF(0), base_name->str);
82
82
    return 0;
83
83
  }
84
 
  session->lex().setCacheable(false);
 
84
  session->lex->setCacheable(false);
85
85
 
86
86
  set_if_smaller(component_name->length, (size_t)MAX_SYS_VAR_LENGTH);
87
87