← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: David Axmark
  • Date: 2008-11-05 05:50:56 UTC
  • mto: (584.1.3 devel)
  • mto: This revision was merged to the branch mainline in revision 586.
  • Revision ID: davida@davids-laptop-20081105055056-bt8ajhvihu0j28kp
Changed NEWDATE to DATE. One failing test but I think its somewhere else in the code 
(func_math).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
10361
10361
        session->substitute_null_with_insert_id= false;
10362
10362
      }
10363
10363
      /* fix to replace 'NULL' dates with '0' (shreeve@uci.edu) */
10364
 
      else if (((field->type() == DRIZZLE_TYPE_NEWDATE) ||
 
10364
      else if (((field->type() == DRIZZLE_TYPE_DATE) ||
10365
10365
                (field->type() == DRIZZLE_TYPE_DATETIME)) &&
10366
10366
                (field->flags & NOT_NULL_FLAG) &&
10367
10367
               !field->table->maybe_null)
14583
14583
          by 8 as maximum pack length of such fields.
14584
14584
        */
14585
14585
        if (type == DRIZZLE_TYPE_TIME ||
14586
 
            type == DRIZZLE_TYPE_NEWDATE ||
 
14586
            type == DRIZZLE_TYPE_DATE ||
14587
14587
            type == DRIZZLE_TYPE_DATETIME ||
14588
14588
            type == DRIZZLE_TYPE_TIMESTAMP)
14589
14589
        {