1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverted wrong patch, fix for Windows 32bit build.

Browse Source
This commit is contained in:
jani@hynda.mysql.fi 2008-02-26 18:44:04 +02:00
parent 6f03ad0791
commit b7bef32d2d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/my_getsystime.c
View File

@ -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)
/*

6
sql/mysqld.cc
View File

@ -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;