← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_select.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_select.cc
10560
10560
        thd->substitute_null_with_insert_id= false;
10561
10561
      }
10562
10562
      /* fix to replace 'NULL' dates with '0' (shreeve@uci.edu) */
10563
 
      else if (((field->type() == MYSQL_TYPE_DATE) ||
 
10563
      else if (((field->type() == MYSQL_TYPE_NEWDATE) ||
10564
10564
                (field->type() == MYSQL_TYPE_DATETIME)) &&
10565
10565
                (field->flags & NOT_NULL_FLAG) &&
10566
10566
               !field->table->maybe_null)
10832
10832
      To preserve type they needed to be handled separately.
10833
10833
    */
10834
10834
    if ((type= item->field_type()) == MYSQL_TYPE_DATETIME ||
10835
 
        type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_DATE ||
 
10835
        type == MYSQL_TYPE_TIME || type == MYSQL_TYPE_NEWDATE ||
10836
10836
        type == MYSQL_TYPE_TIMESTAMP)
10837
10837
      new_field= item->tmp_table_field_from_field_type(table, 1);
10838
10838
    /* 
16747
16747
          by 8 as maximum pack length of such fields.
16748
16748
        */
16749
16749
        if (type == MYSQL_TYPE_TIME ||
16750
 
            type == MYSQL_TYPE_DATE ||
 
16750
            type == MYSQL_TYPE_NEWDATE ||
16751
16751
            type == MYSQL_TYPE_DATETIME ||
16752
16752
            type == MYSQL_TYPE_TIMESTAMP)
16753
16753
        {