diff options
| author | evgen@moonbone.local <> | 2006-08-29 18:58:50 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2006-08-29 18:58:50 +0400 |
| commit | 8cf97817173c080ec9399b306a9f5dbae96e5124 (patch) | |
| tree | 9d51093e989e3337f3ebf66b989e6da4245afb95 /sql/item_timefunc.cc | |
| parent | 002af6b5ea6e49e059bdc6e877f73e61912f16ea (diff) | |
| parent | 7a55f7fac4fbd465321b641a1a0dca088eb099ea (diff) | |
| download | mariadb-git-8cf97817173c080ec9399b306a9f5dbae96e5124.tar.gz | |
Merge moonbone.local:/work/tmp_merge-5.0-mysql
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
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 f603cafd89d..a259fd90485 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 */ |