Commit b7bef32d authored by jani@hynda.mysql.fi's avatar jani@hynda.mysql.fi

Reverted wrong patch, fix for Windows 32bit build.

parent 6f03ad07
...@@ -157,7 +157,7 @@ ulonglong my_micro_time_and_time(time_t *time_arg) ...@@ -157,7 +157,7 @@ ulonglong my_micro_time_and_time(time_t *time_arg)
#if defined(__WIN__) #if defined(__WIN__)
ulonglong newtime; ulonglong newtime;
GetSystemTimeAsFileTime((FILETIME*)&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); return (newtime/10);
#elif defined(HAVE_GETHRTIME) #elif defined(HAVE_GETHRTIME)
/* /*
......
...@@ -308,7 +308,11 @@ TYPELIB thread_handling_typelib= ...@@ -308,7 +308,11 @@ TYPELIB thread_handling_typelib=
const char *first_keyword= "first", *binary_keyword= "BINARY"; const char *first_keyword= "first", *binary_keyword= "BINARY";
const char *my_localhost= "localhost", *delayed_user= "DELAYED"; const char *my_localhost= "localhost", *delayed_user= "DELAYED";
#define GET_HA_ROWS (~ (ha_rows) 0) #if SIZEOF_OFF_T > 4 && defined(BIG_TABLES)
#define GET_HA_ROWS GET_ULL
#else
#define GET_HA_ROWS GET_ULONG
#endif
bool opt_large_files= sizeof(my_off_t) > 4; bool opt_large_files= sizeof(my_off_t) > 4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment