From 36120d420a56c336a4fbf3069d91455e4118798b Mon Sep 17 00:00:00 2001
From: "konstantin@mysql.com" <>
Date: Mon, 15 Mar 2004 22:39:36 +0300
Subject: Fix of compilation failure of latest 4.1 tree: new constants in
 mysqld.cc exceed unsigned long limit.

---
 include/config-win.h | 1 +
 include/my_global.h  | 8 ++++++++
 2 files changed, 9 insertions(+)

(limited to 'include')

diff --git a/include/config-win.h b/include/config-win.h
index abc1aa7a6ee..518f445861a 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -95,6 +95,7 @@ functions */
 #define LONGLONG_MAX	((__int64) 0x7FFFFFFFFFFFFFFF)
 #define ULONGLONG_MAX	((unsigned __int64) 0xFFFFFFFFFFFFFFFF)
 #define LL(A)		((__int64) A)
+#define ULL(A)		((unsigned __int64) A)
 
 /* Type information */
 
diff --git a/include/my_global.h b/include/my_global.h
index 2a82173979d..4a56741ddbc 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -842,6 +842,14 @@ typedef char		bool;	/* Ordinary boolean values 0 1 */
 #endif
 #endif
 
+#ifndef ULL
+#ifdef HAVE_LONG_LONG
+#define ULL(A) A ## ULL
+#else
+#define ULL(A) A ## UL
+#endif
+#endif
+
 /*
   Defines to make it possible to prioritize register assignments. No
   longer that important with modern compilers.
-- 
cgit v1.2.1