← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_cmpfunc.cc

  • Committer: Monty Taylor
  • Date: 2008-07-31 18:25:59 UTC
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: monty@inaugust.com-20080731182559-txjt9f3dfhusxfp8
Renamed MYSQL_TIME to DRIZZLE_TIME.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_cmpfunc.cc
650
650
{
651
651
  uint64_t value= 0;
652
652
  int error;
653
 
  MYSQL_TIME l_time;
 
653
  DRIZZLE_TIME l_time;
654
654
  enum_mysql_timestamp_type ret;
655
655
 
656
656
  ret= str_to_datetime(str->ptr(), str->length(), &l_time,
659
659
                         (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE))),
660
660
                       &error);
661
661
 
662
 
  if (ret == MYSQL_TIMESTAMP_DATETIME || ret == MYSQL_TIMESTAMP_DATE)
 
662
  if (ret == DRIZZLE_TIMESTAMP_DATETIME || ret == DRIZZLE_TIMESTAMP_DATE)
663
663
  {
664
664
    /*
665
665
      Do not return yet, we may still want to throw a "trailing garbage"
757
757
      bool error;
758
758
      String tmp, *str_val= 0;
759
759
      timestamp_type t_type= (date_arg->field_type() == DRIZZLE_TYPE_NEWDATE ?
760
 
                              MYSQL_TIMESTAMP_DATE : MYSQL_TIMESTAMP_DATETIME);
 
760
                              DRIZZLE_TIMESTAMP_DATE : DRIZZLE_TIMESTAMP_DATETIME);
761
761
 
762
762
      str_val= str_arg->val_str(&tmp);
763
763
      if (str_arg->null_value)
806
806
{
807
807
  uint64_t value;
808
808
  Item *item= **item_arg;
809
 
  MYSQL_TIME ltime;
 
809
  DRIZZLE_TIME ltime;
810
810
 
811
811
  if (item->result_as_int64_t())
812
812
  {
982
982
    bool error;
983
983
    enum_field_types f_type= warn_item->field_type();
984
984
    timestamp_type t_type= f_type ==
985
 
      DRIZZLE_TYPE_NEWDATE ? MYSQL_TIMESTAMP_DATE : MYSQL_TIMESTAMP_DATETIME;
 
985
      DRIZZLE_TYPE_NEWDATE ? DRIZZLE_TIMESTAMP_DATE : DRIZZLE_TIMESTAMP_DATETIME;
986
986
    value= get_date_from_str(thd, str, t_type, warn_item->name, &error);
987
987
    /*
988
988
      If str did not contain a valid date according to the current