aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2016-07-07 13:46:51 -0400
committerRobert Haas <rhaas@postgresql.org>2016-07-07 13:46:51 -0400
commitb22934dc032d7b2a297c2d35dc10fd403c8de631 (patch)
tree9691ef537b6cdd4a3fc5f29f39dd2bc3e8c5a513
parentd1f822e58597cac5000bf69b893cc236c5ef5fcb (diff)
downloadpostgresql-b22934dc032d7b2a297c2d35dc10fd403c8de631.tar.gz
postgresql-b22934dc032d7b2a297c2d35dc10fd403c8de631.zip
Fix a prototype which is inconsistent with the function definition.
Peter Geoghegan
-rw-r--r--src/backend/utils/sort/tuplesort.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 7878660055a..9b60ceab4cb 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -542,7 +542,7 @@ static void inittapes(Tuplesortstate *state);
static void selectnewtape(Tuplesortstate *state);
static void mergeruns(Tuplesortstate *state);
static void mergeonerun(Tuplesortstate *state);
-static void beginmerge(Tuplesortstate *state, bool finalMerge);
+static void beginmerge(Tuplesortstate *state, bool finalMergeBatch);
static void batchmemtuples(Tuplesortstate *state);
static void mergebatch(Tuplesortstate *state, int64 spacePerTape);
static void mergebatchone(Tuplesortstate *state, int srcTape,