← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Olaf van der Spek
  • Date: 2011-09-19 09:31:36 UTC
  • mto: This revision was merged to the branch mainline in revision 2430.
  • Revision ID: olafvdspek@gmail.com-20110919093136-9snt9mac7cgpfkme
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
843
843
      default_value= 0;
844
844
      if ((type_modifier & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) == NOT_NULL_FLAG)
845
845
      {
846
 
        my_error(ER_INVALID_DEFAULT, MYF(0), field_name->str);
847
 
        return true;
 
846
        my_error(ER_INVALID_DEFAULT, MYF(0), field_name->str);
 
847
        return true;
848
848
      }
849
849
    }
850
850
    else if (type_modifier & AUTO_INCREMENT_FLAG)
861
861
  }
862
862
 
863
863
  CreateField* new_field= new CreateField;
864
 
  if (new_field->init(session, field_name->str, type, length, decimals, type_modifier, comment, change, interval_list, cs, 0, column_format)
 
864
  if (new_field->init(session, field_name->str, type, length, decimals, type_modifier, *comment, change, interval_list, cs, 0, column_format)
865
865
      || new_field->setDefaultValue(default_value, on_update_value))
866
866
    return true;
867
867