← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
1003
1003
  return (Item**) not_found_item;
1004
1004
}
1005
1005
 
1006
 
void Item::init_make_field(SendField *tmp_field,
1007
 
                           enum enum_field_types field_type_arg)
 
1006
void Item::init_make_field(SendField *tmp_field, enum_field_types field_type_arg)
1008
1007
{
1009
 
  char *empty_name= (char*) "";
1010
 
  tmp_field->db_name=   empty_name;
1011
 
  tmp_field->org_table_name= empty_name;
1012
 
  tmp_field->org_col_name= empty_name;
1013
 
  tmp_field->table_name= empty_name;
 
1008
  tmp_field->db_name=   "";
 
1009
  tmp_field->org_table_name= "";
 
1010
  tmp_field->org_col_name= "";
 
1011
  tmp_field->table_name= "";
1014
1012
  tmp_field->col_name= name;
1015
1013
  tmp_field->charsetnr= collation.collation->number;
1016
 
  tmp_field->flags= (maybe_null ? 0 : NOT_NULL_FLAG) |
1017
 
                    (my_binary_compare(collation.collation) ?
1018
 
                      BINARY_FLAG : 0);
 
1014
  tmp_field->flags= (maybe_null ? 0 : NOT_NULL_FLAG) | (my_binary_compare(collation.collation) ? BINARY_FLAG : 0);
1019
1015
  tmp_field->type= field_type_arg;
1020
1016
  tmp_field->length= max_length;
1021
1017
  tmp_field->decimals= decimals;