← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/year.cc

  • Committer: patrick crews
  • Date: 2010-09-16 14:38:00 UTC
  • mfrom: (1768 staging)
  • mto: (1771.1.1 pcrews)
  • mto: This revision was merged to the branch mainline in revision 1772.
  • Revision ID: gleebix@gmail.com-20100916143800-hyu1tcfnjcowfnpb
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/year.cc
57
57
        char buff[DRIZZLE_MAX_LENGTH_DATETIME_AS_STRING];
58
58
        String tmp(buff,sizeof(buff), &my_charset_utf8_bin);
59
59
        String *res= args[0]->val_str(&tmp);
60
 
        if (! temporal.from_string(res->c_ptr(), res->length()))
 
60
 
 
61
        if (res && (res != &tmp))
 
62
        {
 
63
          tmp.copy(*res);
 
64
        }
 
65
 
 
66
        if (! temporal.from_string(tmp.c_ptr(), tmp.length()))
61
67
        {
62
68
          /* 
63
69
          * Could not interpret the function argument as a temporal value, 
64
70
          * so throw an error and return 0
65
71
          */
66
 
          my_error(ER_INVALID_DATETIME_VALUE, MYF(0), res->c_ptr());
 
72
          my_error(ER_INVALID_DATETIME_VALUE, MYF(0), tmp.c_ptr());
67
73
          return 0;
68
74
        }
69
75
      }
85
91
 
86
92
        res= args[0]->val_str(&tmp);
87
93
 
88
 
        my_error(ER_INVALID_DATETIME_VALUE, MYF(0), res->c_ptr());
 
94
        if (res && (res != &tmp))
 
95
        {
 
96
          tmp.copy(*res);
 
97
        }
 
98
 
 
99
        my_error(ER_INVALID_DATETIME_VALUE, MYF(0), tmp.c_ptr());
89
100
        return 0;
90
101
      }
91
102
  }