Commit 4f630bf3 authored by unknown's avatar unknown
Browse files

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


sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
parents ad0f34e3 a7088b3c

sql/item_timefunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, 
	tmp= (char*) val + min(2, val_len);

	l_time->day= (int) my_strtoll10(val, &tmp, &error);

	/* Skip 'st, 'nd, 'th .. */

	val= tmp + min((int) (end-tmp), 2);

	val= tmp + min((int) (val_end-tmp), 2);

	break;



	/* Hour */