← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/table.proto

  • Committer: Brian Aker
  • Date: 2010-10-15 00:59:36 UTC
  • mfrom: (1849 staging)
  • mto: This revision was merged to the branch mainline in revision 1853.
  • Revision ID: brian@tangent.org-20101015005936-znhvkz8khs4fhlyv
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/table.proto
56
56
      OPTION_CASCADE = 2;
57
57
      OPTION_SET_NULL = 3;
58
58
      OPTION_NO_ACTION = 4;
59
 
      OPTION_SET_DEFAULT = 5;
 
59
      OPTION_DEFAULT = 5;
60
60
    }
61
61
 
62
62
    required ForeignKeyOption update_option = 6 [ default = OPTION_UNDEF ];
76
76
      DATE = 7;
77
77
      TIMESTAMP = 9;
78
78
      DATETIME = 10;
79
 
      UUID = 11;
80
79
    }
81
80
 
82
81
    message FieldOptions {