← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: David Shrewsbury
  • Date: 2010-10-10 22:33:34 UTC
  • mfrom: (1835 trunk-drizzle)
  • mto: (1838.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1839.
  • Revision ID: shrewsbury.dave@gmail.com-20101010223334-t3te50qwikbztr3m
Merged from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
2034
2034
    ge_cmp.set_datetime_cmp_func(args, args + 1);
2035
2035
    le_cmp.set_datetime_cmp_func(args, args + 2);
2036
2036
  }
2037
 
  else if (args[0]->real_item()->type() == FIELD_ITEM &&
2038
 
           session->lex->sql_command != SQLCOM_SHOW_CREATE)
 
2037
  else if (args[0]->real_item()->type() == FIELD_ITEM)
2039
2038
  {
2040
2039
    Item_field *field_item= (Item_field*) (args[0]->real_item());
2041
2040
    if (field_item->field->can_be_compared_as_int64_t())
3677
3676
        comparison type accordingly.
3678
3677
      */
3679
3678
      if (args[0]->real_item()->type() == FIELD_ITEM &&
3680
 
          session->lex->sql_command != SQLCOM_SHOW_CREATE &&
3681
3679
          cmp_type != INT_RESULT)
3682
3680
      {
3683
3681
        Item_field *field_item= (Item_field*) (args[0]->real_item());