From b7bef32d2dc7e0f5c5fd7b6da424455b023d8b4d Mon Sep 17 00:00:00 2001
From: "jani@hynda.mysql.fi" <>
Date: Tue, 26 Feb 2008 18:44:04 +0200
Subject: [PATCH] Reverted wrong patch, fix for Windows 32bit build.

---
 mysys/my_getsystime.c | 2 +-
 sql/mysqld.cc         | 6 +++++-
 2 files changed, 6 insertions(+), 2 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)
   /*
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 455698d4ff4..9ca2ab5db0e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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;