← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

  • Committer: Mark Atwood
  • Date: 2011-08-03 15:44:55 UTC
  • mfrom: (2318.8.15 refactor2)
  • Revision ID: me@mark.atwood.name-20110803154455-jqg3gnxofkq8wetv
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
172
172
  charset= &my_charset_bin;
173
173
  decimals= decimals_arg & FIELDFLAG_MAX_DEC;
174
174
 
175
 
  if (! maybe_null)
176
 
    flags= NOT_NULL_FLAG;
177
 
  else
178
 
    flags= 0;
 
175
  flags= maybe_null ? 0 : NOT_NULL_FLAG;
179
176
}
180
177
 
181
178
bool CreateField::init(Session *,
182
 
                        char *fld_name,
 
179
                        const char *fld_name,
183
180
                        enum_field_types fld_type,
184
 
                        char *fld_length,
185
 
                        char *fld_decimals,
 
181
                        const char *fld_length,
 
182
                        const char *fld_decimals,
186
183
                        uint32_t fld_type_modifier,
187
184
                        lex_string_t *fld_comment,
188
 
                        char *fld_change,
 
185
                        const char *fld_change,
189
186
                        List<String> *fld_interval_list,
190
 
                        const charset_info_st * const fld_charset,
 
187
                        const charset_info_st* fld_charset,
191
188
                        uint32_t,
192
 
                        enum column_format_type column_format_in)
 
189
                        column_format_type column_format_in)
193
190
{
194
191
  uint32_t sign_len= 0;
195
192
  uint32_t allowed_type_modifier= 0;