diff options
| author | unknown <monty@mysql.com> | 2004-05-07 01:43:17 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-07 01:43:17 +0300 |
| commit | f3544f3c5dd137e125a980c151e53ab71b23aba5 (patch) | |
| tree | f2717f686b72c32ff82659eaf22da3a53b8deb1a /sql/item_timefunc.cc | |
| parent | ffdf46a58ac73ce0862f1cf632e4254170ed6116 (diff) | |
| download | mariadb-git-f3544f3c5dd137e125a980c151e53ab71b23aba5.tar.gz | |
Portability fixes
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
configure.in:
Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
extra/my_print_defaults.c:
Fixed wrong definition for 'verbose'
include/my_global.h:
Portability fix (IRIX64)
libmysql/client_settings.h:
Remove compiler warnings
libmysql/libmysql.c:
Remove compiler warnings
mysql-test/r/func_str.result:
Updated results
mysql-test/r/key_cache.result:
Updated results to not depend on key_blocks_unused
mysql-test/t/func_str.test:
More test of long overflow
mysql-test/t/key_cache.test:
Updated results to not depend on key_blocks_unused
sql/item.cc:
Portability fix (don't use strtoll())
sql/item.h:
Portability fix (don't use strtoll())
sql/item_sum.h:
Portability fix (don't use strtoll())
sql/item_timefunc.cc:
Fixed compiler warning
strings/ctype-simple.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
strings/ctype-ucs2.c:
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
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 0c0b5265db7..e8848243812 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1666,7 +1666,7 @@ bool Item_date_add_interval::get_date(TIME *ltime, uint fuzzy_date) days--; sec+= 3600*LL(24); } - ltime->second_part= microseconds; + ltime->second_part= (uint) microseconds; ltime->second= (uint) (sec % 60); ltime->minute= (uint) (sec/60 % 60); ltime->hour= (uint) (sec/3600); |