← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/str.cc

Merge from Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/str.cc
140
140
 
141
141
/* If one of the fields is binary and the other one isn't return 1 else 0 */
142
142
 
143
 
bool Field_str::compare_str_field_flags(Create_field *new_field_ptr,
 
143
bool Field_str::compare_str_field_flags(CreateField *new_field_ptr,
144
144
                                        uint32_t flag_arg)
145
145
{
146
146
  return (((new_field_ptr->flags & (BINCMP_FLAG | BINARY_FLAG)) &&
150
150
}
151
151
 
152
152
 
153
 
uint32_t Field_str::is_equal(Create_field *new_field_ptr)
 
153
uint32_t Field_str::is_equal(CreateField *new_field_ptr)
154
154
{
155
155
  if (compare_str_field_flags(new_field_ptr, flags))
156
156
    return 0;