diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index 9f1fd12b2cd85aa1fcf679d2348acda1dae84748..17eca3d239f91b81c96d8f304b8b81ab0870ea75 100644
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *          $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.5 2006/07/14 14:52:16 momjian Exp $
+ *          $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.6 2006/09/05 18:25:10 teodor Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -122,7 +122,22 @@ compareEntries(GinState *ginstate, Datum a, Datum b) {
 }
 
 static FmgrInfo* cmpDatumPtr=NULL;
-static bool needUnique = FALSE;
+
+#if defined(__INTEL_COMPILER) && (defined(__ia64__) || defined(__ia64))   
+/* 
+ * Intel Compiler on Intel Itanium with -O2 has a bug around
+ * change static variable by user function called from
+ * libc func: it doesn't change. So mark it as volatile.
+ *
+ * It's a pity, but it's impossible to define optimization
+ * level here.
+ */
+#define	VOLATILE	volatile
+#else
+#define VOLATILE
+#endif
+
+static bool VOLATILE needUnique = FALSE;
 
 static int
 cmpEntries(const void * a, const void * b) {