← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

  • Committer: Brian Aker
  • Date: 2010-02-25 07:54:52 UTC
  • mfrom: (1273.13.101 build)
  • Revision ID: brian@gaz-20100225075452-19eozreshbrerypu
Merge of all patches in build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
247
247
      field_options->set_update_value("NOW()");
248
248
    }
249
249
 
 
250
    if (field_arg->def == NULL  && attribute->constraints().is_nullable())
 
251
    {
 
252
      message::Table::Field::FieldOptions *field_options;
 
253
      field_options= attribute->mutable_options();
 
254
 
 
255
      field_options->set_default_null(true);
 
256
    }
250
257
    if(field_arg->def)
251
258
    {
252
259
      message::Table::Field::FieldOptions *field_options;
253
260
      field_options= attribute->mutable_options();
254
 
 
 
261
 
255
262
      if(field_arg->def->is_null())
256
263
      {
257
264
        field_options->set_default_null(true);
560
567
  if (plugin::StorageEngine::createTable(*session,
561
568
                                         identifier,
562
569
                                         false, *table_proto))
 
570
  {
563
571
    goto err_handler;
 
572
  }
 
573
 
564
574
  return 0;
565
575
 
566
576
err_handler: