← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
56
56
#include "drizzled/table/temporary.h"
57
57
#include "drizzled/table/placeholder.h"
58
58
#include "drizzled/table/unused.h"
 
59
#include "drizzled/plugin/storage_engine.h"
 
60
 
 
61
#include <drizzled/refresh_version.h>
59
62
 
60
63
using namespace std;
61
64
 
1758
1761
  Table **start,**ptr;
1759
1762
  uint32_t lock_flag= DRIZZLE_LOCK_NOTIFY_IF_NEED_REOPEN;
1760
1763
 
1761
 
  if (!(ptr=start=(Table**) session->alloc(sizeof(Table*)*count)))
 
1764
  if (!(ptr=start=(Table**) session->getMemRoot()->allocate(sizeof(Table*)*count)))
1762
1765
    return -1;
1763
1766
 
1764
1767
  for (table= tables; table; table= table->next_global)