← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2008-07-31 19:57:34 UTC
  • mfrom: (236.1.27 codestyle)
  • Revision ID: brian@tangent.org-20080731195734-c7cu4gx70xgjr68o
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
5132
5132
  if (alter_info->error_if_not_empty && thd->row_count)
5133
5133
  {
5134
5134
    const char *f_val= 0;
5135
 
    enum enum_mysql_timestamp_type t_type= MYSQL_TIMESTAMP_DATE;
 
5135
    enum enum_drizzle_timestamp_type t_type= DRIZZLE_TIMESTAMP_DATE;
5136
5136
    switch (alter_info->datetime_field->sql_type)
5137
5137
    {
5138
5138
      case DRIZZLE_TYPE_NEWDATE:
5139
5139
        f_val= "0000-00-00";
5140
 
        t_type= MYSQL_TIMESTAMP_DATE;
 
5140
        t_type= DRIZZLE_TIMESTAMP_DATE;
5141
5141
        break;
5142
5142
      case DRIZZLE_TYPE_DATETIME:
5143
5143
        f_val= "0000-00-00 00:00:00";
5144
 
        t_type= MYSQL_TIMESTAMP_DATETIME;
 
5144
        t_type= DRIZZLE_TIMESTAMP_DATETIME;
5145
5145
        break;
5146
5146
      default:
5147
5147
        /* Shouldn't get here. */