← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/get_system_var.cc

Merged Nathan from lp:~nlws/drizzle/fix-string-c-ptr-overrun

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/get_system_var.cc
20
20
#include <drizzled/server_includes.h>
21
21
#include CSTDINT_H
22
22
#include <drizzled/error.h>
23
 
#include <drizzled/functions/get_system_var.h>
 
23
#include <drizzled/function/get_system_var.h>
24
24
#include <drizzled/session.h>
25
25
 
26
26
Item_func_get_system_var::
80
80
    }
81
81
  }
82
82
 
83
 
  set_if_smaller(component_name->length, MAX_SYS_VAR_LENGTH);
 
83
  set_if_smaller(component_name->length, (size_t)MAX_SYS_VAR_LENGTH);
84
84
 
85
85
  return new Item_func_get_system_var(var, var_type, component_name,
86
86
                                      NULL, 0);