← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

Merged from PatG.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
3134
3134
    */
3135
3135
    if (default_value->type() == Item::FUNC_ITEM && 
3136
3136
        !(((Item_func*)default_value)->functype() == Item_func::NOW_FUNC &&
3137
 
         type == FIELD_TYPE_TIMESTAMP))
 
3137
         type == DRIZZLE_TYPE_TIMESTAMP))
3138
3138
    {
3139
3139
      my_error(ER_INVALID_DEFAULT, MYF(0), field_name->str);
3140
3140
      return(1);
3156
3156
    }
3157
3157
  }
3158
3158
 
3159
 
  if (on_update_value && type != FIELD_TYPE_TIMESTAMP)
 
3159
  if (on_update_value && type != DRIZZLE_TYPE_TIMESTAMP)
3160
3160
  {
3161
3161
    my_error(ER_INVALID_ON_UPDATE, MYF(0), field_name->str);
3162
3162
    return(1);