← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/insert_value.cc

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/insert_value.cc
83
83
  {
84
84
    Field *tmp_field= field_arg->field;
85
85
    /* charset doesn't matter here, it's to avoid sigsegv only */
86
 
    tmp_field= new Field_null(0, 0, Field::NONE, field_arg->field->field_name,
87
 
                          &my_charset_bin);
 
86
    tmp_field= new Field_null(0, 0, field_arg->field->field_name, &my_charset_bin);
88
87
    if (tmp_field)
89
88
    {
90
89
      tmp_field->init(field_arg->field->table);