← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal_interval.cc

  • Committer: Stewart Smith
  • Date: 2010-08-05 16:41:55 UTC
  • mfrom: (1638.9.13)
  • mto: (1720.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1721.
  • Revision ID: stewart@flamingspork.com-20100805164155-7olu6iv6rwoxfsne
Merged store-foreign-key-in-table-proto into show-create-table-using-table-message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/temporal_interval.cc
311
311
    const char *start= str;
312
312
    for (value= 0 ; str != end && my_isdigit(cs,*str) ; str++)
313
313
      value= value * 10L + (int64_t) (*str - '0');
314
 
    if (transform_msec && x == count - 1) // microseconds always last
 
314
    if (transform_msec && (x == count - 1 || str == end)) // microseconds always last
315
315
    {
316
316
      long msec_length= 6 - (str - start);
317
317
      if (msec_length > 0)
323
323
    if (str == end && x != count-1)
324
324
    {
325
325
      x++;
326
 
      /* Change values[0...x-1] -> values[0...count-1] */
 
326
      /* Change values[0...x-1] -> values[count-x...count-1] */
327
327
      internal::bmove_upp((unsigned char*) (values+count),
328
328
                          (unsigned char*) (values+x),
329
329
                          sizeof(*values)*x);