← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.h
50
50
                            Item *warn_item, 
51
51
                            bool *is_null);
52
52
 
53
 
class Arg_comparator: public Sql_alloc
 
53
class Arg_comparator: public drizzled::memory::SqlAlloc
54
54
{
55
55
  Item **a, **b;
56
56
  arg_cmp_func func;
762
762
 
763
763
/* A vector of values of some type  */
764
764
 
765
 
class in_vector :public Sql_alloc
 
765
class in_vector :public drizzled::memory::SqlAlloc
766
766
{
767
767
public:
768
768
  char *base;
774
774
  in_vector() {}
775
775
  in_vector(uint32_t elements,uint32_t element_length,qsort2_cmp cmp_func,
776
776
            const CHARSET_INFO * const cmp_coll)
777
 
    :base((char*) sql_calloc(elements*element_length)),
 
777
    :base((char*) drizzled::memory::sql_calloc(elements*element_length)),
778
778
     size(element_length), compare(cmp_func), collation(cmp_coll),
779
779
     count(elements), used_count(elements) {}
780
780
  virtual ~in_vector() {}
940
940
** Classes for easy comparing of non const items
941
941
*/
942
942
 
943
 
class cmp_item :public Sql_alloc
 
943
class cmp_item :public drizzled::memory::SqlAlloc
944
944
{
945
945
public:
946
946
  const CHARSET_INFO *cmp_charset;
1577
1577
  { return fields.head()->collation.collation; }
1578
1578
};
1579
1579
 
1580
 
class COND_EQUAL: public Sql_alloc
 
1580
class COND_EQUAL: public drizzled::memory::SqlAlloc
1581
1581
{
1582
1582
public:
1583
1583
  uint32_t max_members;               /* max number of members the current level