← 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: Lee Bieber
  • Date: 2011-01-10 20:12:43 UTC
  • mfrom: (2069.1.3 build)
  • Revision ID: kalebral@gmail.com-20110110201243-j7xse6v4ptaipc92
Merge Gustaf - Use constrained_check<> classes on kernel sysvars 
Merge Andrew - fix bug 645004: libuuid configure error message needs changing
Merge Stewart - fix bug 698315: innobase tests fail with --repeat=2

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
 
#include <drizzled/sys_var.h>
26
25
 
27
26
namespace drizzled
28
27
{
50
49
  */
51
50
  if (!(item= var->item(session, var_type, &component)))
52
51
    return(1);                             // Impossible
53
 
 
54
52
  item->set_name(name, 0, system_charset_info); // don't allocate a new name
55
53
  session->change_item_tree(ref, item);
56
54
 
81
79
    my_error(ER_VARIABLE_IS_NOT_STRUCT, MYF(0), base_name->str);
82
80
    return 0;
83
81
  }
84
 
  session->getLex()->setCacheable(false);
 
82
  session->lex->setCacheable(false);
85
83
 
86
84
  set_if_smaller(component_name->length, (size_t)MAX_SYS_VAR_LENGTH);
87
85