diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-02-26 15:16:46 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-02-26 15:16:46 +0200 |
| commit | 5853210e380410a83df33c180a19b063dad543b2 (patch) | |
| tree | f63582853e852b24dcc47ee95dafb9c65e2dadba /sql/item_timefunc.cc | |
| parent | 3fcb25d806c84c41f85f3bb6b27275a42b3cb8b5 (diff) | |
| parent | a7f6326631a5187b4d5dce2b1e0d3cb6ea33ea20 (diff) | |
| download | mariadb-git-5853210e380410a83df33c180a19b063dad543b2.tar.gz | |
merge 5.0-bugteam -> 5.1-bugteam
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 ded4d28ca29..4248c2e6b4f 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -876,7 +876,7 @@ static bool get_interval_info(const char *str,uint length,CHARSET_INFO *cs, value= value*LL(10) + (longlong) (*str - '0'); if (transform_msec && i == count - 1) // microseconds always last { - int msec_length= 6 - (int)(str - start); + int msec_length= 6 - (int) (str - start); if (msec_length > 0) value*= (long)log_10_int[msec_length]; } |