Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
parents 39a8fe6e dbf62f25
...@@ -224,7 +224,7 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, ...@@ -224,7 +224,7 @@ static bool extract_date_time(DATE_TIME_FORMAT *format,
tmp= (char*) val + min(2, val_len); tmp= (char*) val + min(2, val_len);
l_time->day= (int) my_strtoll10(val, &tmp, &error); l_time->day= (int) my_strtoll10(val, &tmp, &error);
/* Skip 'st, 'nd, 'th .. */ /* Skip 'st, 'nd, 'th .. */
val= tmp + min((int) (end-tmp), 2); val= tmp + min((int) (val_end-tmp), 2);
break; break;
/* Hour */ /* Hour */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment