aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2006-09-03 01:15:40 +0000
committerBruce Momjian <bruce@momjian.us>2006-09-03 01:15:40 +0000
commit754c7d53a458e7c86d475995bf5830da82518f7b (patch)
treeebb86a200fb7217da9e738bf6e98c3ce12b1927f /src
parentb0e546844807602b93a4281f7ac6ff6ea68d40ca (diff)
downloadpostgresql-754c7d53a458e7c86d475995bf5830da82518f7b.tar.gz
postgresql-754c7d53a458e7c86d475995bf5830da82518f7b.zip
Fix LLONG_MAX define used by new int64 FETCH/MOVE patch.
Diffstat (limited to 'src')
-rw-r--r--src/backend/tcop/pquery.c4
-rw-r--r--src/include/nodes/parsenodes.h9
2 files changed, 10 insertions, 3 deletions
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 257655ddb0f..a5b474104f6 100644
--- 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
index acdb05ed4fe..71ba4af83b2 100644
--- 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
{