Fix LLONG_MAX define used by new int64 FETCH/MOVE patch.

bmomjian · bmomjian · commit 754c7d53a458 · 2006-09-03T01:15:40.000Z
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.108 2006/09/02 18:17:17 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.109 2006/09/03 01:15:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1347,7 +1347,7 @@ DoPortalRunFetch(Portal portal,
 				 * we are.	In any case, we arrange to fetch the target row
 				 * going forwards.
 				 */
-				if (portal->posOverflow || portal->portalPos == LLONG_MAX ||
+				if (portal->posOverflow || portal->portalPos == FETCH_ALL ||
 					count - 1 <= portal->portalPos / 2)
 				{
 					DoPortalRewind(portal);
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -7,13 +7,15 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.327 2006/09/02 18:17:17 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.328 2006/09/03 01:15:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSENODES_H
 #define PARSENODES_H
 
+#include "limits.h"
+
 #include "nodes/primnodes.h"
 #include "nodes/value.h"
 
@@ -1439,7 +1441,12 @@ typedef enum FetchDirection
 	FETCH_RELATIVE
 } FetchDirection;
 
+#ifdef HAVE_INT64
 #define FETCH_ALL	LLONG_MAX
+#else
+#define FETCH_ALL	LONG_MAX
+#endif
+
 
 typedef struct FetchStmt
 {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.108 2006/09/02 18:17:17 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.109 2006/09/03 01:15:40 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1347,7 +1347,7 @@ DoPortalRunFetch(Portal portal,`
`1347`	`1347`	`* we are. In any case, we arrange to fetch the target row`
`1348`	`1348`	`* going forwards.`
`1349`	`1349`	`*/`
`1350`		`- if (portal->posOverflow \|\| portal->portalPos == LLONG_MAX \|\|`
	`1350`	`+ if (portal->posOverflow \|\| portal->portalPos == FETCH_ALL \|\|`
`1351`	`1351`	`count - 1 <= portal->portalPos / 2)`
`1352`	`1352`	`{`
`1353`	`1353`	`DoPortalRewind(portal);`