summaryrefslogtreecommitdiff
path: root/include/my_time.h
diff options
context:
space:
mode:
authorunknown <patg@radha.patg.net>2006-12-21 22:38:54 -0500
committerunknown <patg@radha.patg.net>2006-12-21 22:38:54 -0500
commit8f3e39bd4985cd6cde244c6a2eb27950ade33585 (patch)
treebd5232aefa6e8bcc963b48390635fbfb9dc441cf /include/my_time.h
parent4a08b64f56c55a6a2f371f20011b2297bf2f0b25 (diff)
downloadmariadb-git-8f3e39bd4985cd6cde244c6a2eb27950ade33585.tar.gz
WL #3031
* Various windows errors fixed * Increased max key length for federated include/my_time.h: WL #3031 Windows compile errors for some platforms. JBalint helped find this fix. sql/log_event.cc: WL #3031 Windows compile errors on some platforms. explicite casting. sql/sql_servers.cc: WL #3031 Add rwlock init to sql_servers to fix hang on windows. storage/federated/ha_federated.h: WL #3031 Increase max key length to innodb's max (Cisco fix)
Diffstat (limited to 'include/my_time.h')
-rw-r--r--include/my_time.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h
index 356595cae2c..c680c92ce46 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -37,7 +37,8 @@ extern uchar days_in_month[];
/* on Win64 long is still 4 bytes (not 8!) */
typedef LONG64 my_time_t;
#else
-typedef long my_time_t;
+typedef time_t my_time_t;
+
#endif
#define MY_TIME_T_MAX LONG_MAX