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

Reverted wrong patch, fix for Windows 32bit build.

parent 6f03ad07

mysys/my_getsystime.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

  /*

sql/mysqld.cc

+5 −1
Original line number Diff line number Diff line
@@ -308,7 +308,11 @@ TYPELIB thread_handling_typelib= 


const char *first_keyword= "first", *binary_keyword= "BINARY";

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;