~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Monty Taylor
  • Date: 2008-11-15 17:58:57 UTC
  • mfrom: (575.5.1 drizzle)
  • mto: (589.1.3 devel)
  • mto: This revision was merged to the branch mainline in revision 586.
  • Revision ID: monty@inaugust.com-20081115175857-kxdeopxzbyyz5bkd
MergedĀ fromĀ David.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4471
4471
  /* For comparison purposes allow invalid dates like 2000-01-32 */
4472
4472
  orig_sql_mode= field->table->in_use->variables.sql_mode;
4473
4473
  if (value->real_item()->type() == Item::STRING_ITEM &&
4474
 
      (field->type() == DRIZZLE_TYPE_NEWDATE ||
 
4474
      (field->type() == DRIZZLE_TYPE_DATE ||
4475
4475
       field->type() == DRIZZLE_TYPE_DATETIME))
4476
4476
    field->table->in_use->variables.sql_mode|= MODE_INVALID_DATES;
4477
4477
  err= value->save_in_field_no_warnings(field, 1);
4494
4494
          for the cases like int_field > 999999999999999999999999 as well.
4495
4495
        */
4496
4496
        tree= 0;
4497
 
        if (err == 3 && field->type() == DRIZZLE_TYPE_NEWDATE &&
 
4497
        if (err == 3 && field->type() == DRIZZLE_TYPE_DATE &&
4498
4498
            (type == Item_func::GT_FUNC || type == Item_func::GE_FUNC ||
4499
4499
             type == Item_func::LT_FUNC || type == Item_func::LE_FUNC) )
4500
4500
        {