← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.h
25
25
#include <drizzled/my_decimal.h>
26
26
#include <drizzled/sql_bitmap.h>
27
27
#include <drizzled/sql_list.h>
28
 
#include <drizzled/sql_alloc.h>
 
28
#include "drizzled/memory/sql_alloc.h"
29
29
#include <drizzled/table.h>
30
30
 
31
31
class TableList;
76
76
 * statement "tree" or Lex.  Each item represents something in the
77
77
 * execution plan.
78
78
 */
79
 
class Item: public Sql_alloc
 
79
class Item: public drizzled::memory::SqlAlloc
80
80
{
81
81
  /* Prevent use of these */
82
82
  Item(const Item &);
162
162
   *
163
163
   * @note
164
164
   *
165
 
   * Alloc & destruct is done as start of select using sql_alloc
 
165
   * Alloc & destruct is done as start of select using memory::sql_alloc
166
166
   */
167
167
  Item();
168
168
  /**