← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_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/sys_var.cc
61
61
#include "drizzled/transaction_services.h"
62
62
#include "drizzled/constrained_value.h"
63
63
#include "drizzled/visibility.h"
 
64
#include "drizzled/plugin/storage_engine.h"
64
65
 
65
66
#include <cstdio>
66
67
#include <map>
1489
1490
drizzle_show_var* enumerate_sys_vars(Session *session)
1490
1491
{
1491
1492
  int size= sizeof(drizzle_show_var) * (system_variable_map.size() + 1);
1492
 
  drizzle_show_var *result= (drizzle_show_var*) session->alloc(size);
 
1493
  drizzle_show_var *result= (drizzle_show_var*) session->getMemRoot()->allocate(size);
1493
1494
 
1494
1495
  if (result)
1495
1496
  {