~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_cmpfunc.cc

Committer: Monty Taylor
Date: 2008-11-16 02:30:08 UTC
mfrom: (584.4.3 fix-headers)
mto: (589.1.3 devel)
mto: This revision was merged to the branch mainline in revision 588.
Revision ID: monty@inaugust.com-20081116023008-rw9n4ovt0hxz6m35

Merged fix-headers.

files added:
drizzled/dtcollation.cc

drizzled/dtcollation.h

drizzled/hybrid_type.h

drizzled/hybrid_type_traits.cc

drizzled/hybrid_type_traits.h

drizzled/hybrid_type_traits_decimal.cc

drizzled/hybrid_type_traits_decimal.h

drizzled/hybrid_type_traits_integer.cc

drizzled/hybrid_type_traits_integer.h

files modified:
configure.ac

drizzled/Makefile.am

drizzled/definitions.h

drizzled/item.cc

drizzled/item.h

drizzled/item_cmpfunc.cc

drizzled/item_sum.cc

drizzled/item_sum.h

Show diffs side-by-side

added added

removed removed

drizzled/item_cmpfunc.cc

219

return found_types;

220

}

221

222

static void my_coll_agg_error(DTCollation &c1, DTCollation &c2,

223

const char *fname)

224

{

225

my_error(ER_CANT_AGGREGATE_2COLLATIONS, MYF(0),

226

c1.collation->name,c1.derivation_name(),

227

c2.collation->name,c2.derivation_name(),

228

fname);

229

}

230

231

222

232

223

Item_bool_func2* Eq_creator::create(Item *a, Item *b) const

233

224

{

Older »