diff options
| author | unknown <jani@hynda.mysql.fi> | 2008-02-26 18:44:04 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2008-02-26 18:44:04 +0200 |
| commit | e265b62b52c4fc4c1fbc0724bf4538ddaaf59a35 (patch) | |
| tree | ac8bceba9f844b54b27c497c9fd0a9b2cbae147d /mysys/my_getsystime.c | |
| parent | 27498bbaba9f40f875d62fe0bb676c8218ee2880 (diff) | |
| download | mariadb-git-e265b62b52c4fc4c1fbc0724bf4538ddaaf59a35.tar.gz | |
Reverted wrong patch, fix for Windows 32bit build.
mysys/my_getsystime.c:
Added extra parenthesis to apply cast to the whole result.
sql/mysqld.cc:
Reversed a wrong patch. This should however be made
better in the future in my_getopt.h, having own define
for GET_HA_ROWS.
Diffstat (limited to 'mysys/my_getsystime.c')
| -rw-r--r-- | mysys/my_getsystime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c index 4a9cac09120..b692b18bfc7 100644 --- a/mysys/my_getsystime.c +++ b/mysys/my_getsystime.c @@ -157,7 +157,7 @@ ulonglong my_micro_time_and_time(time_t *time_arg) #if defined(__WIN__) ulonglong newtime; GetSystemTimeAsFileTime((FILETIME*)&newtime); - *time_arg= (time_t) (newtime - OFFSET_TO_EPOCH) / 10000000; + *time_arg= (time_t) ((newtime - OFFSET_TO_EPOCH) / 10000000); return (newtime/10); #elif defined(HAVE_GETHRTIME) /* |