diff options
| author | tnurnberg@salvation.intern.azundris.com <> | 2006-08-22 14:03:52 +0200 |
|---|---|---|
| committer | tnurnberg@salvation.intern.azundris.com <> | 2006-08-22 14:03:52 +0200 |
| commit | 0ead4ec836265d4bab241c11d817e0d123aafaf8 (patch) | |
| tree | ea852c656e86fd64bf9cceca61829a8db6e3d489 /sql/item_timefunc.cc | |
| parent | 39a8fe6e4490f77a731c33f80cfd2e307d9bb028 (diff) | |
| parent | dbf62f252a7d0dbfa0fa0d99e18ff5f21e670c0a (diff) | |
| download | mariadb-git-0ead4ec836265d4bab241c11d817e0d123aafaf8.tar.gz | |
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
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index babfdc6a180..30230005f6e 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -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 */ |