← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Lee Bieber
  • Date: 2011-03-17 23:23:47 UTC
  • mfrom: (2240.1.3 build)
  • Revision ID: kalebral@gmail.com-20110317232347-15tn59mrrfx2ubvm
Merge Stewart - 728855: BLOB column can have default '' (empty string) in CREATE TABLE but not ALTER TABLE ALTER 
Merge Stewart - 728856: CREATE TABLE t1 (a int default 'aoeu'); succeeds
Merge Stewart - 730420: ER_TOO_BIG_FIELDLENGTH can report allowed size in bytes or characters depending on codepath producing the error
Merge Stewart - dbqp source (and all its libs) should use emacs python mode, not emacs C mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
920
920
    return true;
921
921
  }
922
922
 
923
 
  if (!(new_field= new CreateField()) ||
924
 
      new_field->init(session, field_name->str, type, length, decimals, type_modifier,
925
 
                      default_value, on_update_value, comment, change,
926
 
                      interval_list, cs, 0, column_format))
 
923
  if (!(new_field= new CreateField())
 
924
      || new_field->init(session, field_name->str, type, length, decimals,
 
925
                         type_modifier, comment, change, interval_list,
 
926
                         cs, 0, column_format)
 
927
      || new_field->setDefaultValue(default_value, on_update_value))
927
928
    return true;
928
929
 
929
930
  statement->alter_info.create_list.push_back(new_field);