@@ -297,7 +297,7 @@ static const char *getAttrName(int attrnum, const TableInfo *tblInfo);
297
297
static const char *fmtCopyColumnList(const TableInfo *ti, PQExpBuffer buffer);
298
298
static bool nonemptyReloptions(const char *reloptions);
299
299
static void appendIndexCollationVersion(PQExpBuffer buffer, const IndxInfo *indxinfo,
300
- int enc, bool coll_unknown,
300
+ bool coll_unknown,
301
301
Archive *fout);
302
302
static void appendReloptionsArrayAH(PQExpBuffer buffer, const char *reloptions,
303
303
const char *prefix, Archive *fout);
@@ -16844,8 +16844,7 @@ dumpIndex(Archive *fout, const IndxInfo *indxinfo)
16844
16844
"INDEX", qqindxname);
16845
16845
16846
16846
if (dopt->binary_upgrade)
16847
- appendIndexCollationVersion(q, indxinfo, fout->encoding,
16848
- dopt->coll_unknown, fout);
16847
+ appendIndexCollationVersion(q, indxinfo, dopt->coll_unknown, fout);
16849
16848
16850
16849
/* If the index defines identity, we need to record that. */
16851
16850
if (indxinfo->indisreplident)
@@ -16877,8 +16876,7 @@ dumpIndex(Archive *fout, const IndxInfo *indxinfo)
16877
16876
}
16878
16877
else if (dopt->binary_upgrade)
16879
16878
{
16880
- appendIndexCollationVersion(q, indxinfo, fout->encoding,
16881
- dopt->coll_unknown, fout);
16879
+ appendIndexCollationVersion(q, indxinfo, dopt->coll_unknown, fout);
16882
16880
16883
16881
if (indxinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
16884
16882
ArchiveEntry(fout, indxinfo->dobj.catId, indxinfo->dobj.dumpId,
@@ -18903,7 +18901,7 @@ nonemptyReloptions(const char *reloptions)
18903
18901
* cluster, during a binary upgrade.
18904
18902
*/
18905
18903
static void
18906
- appendIndexCollationVersion(PQExpBuffer buffer, const IndxInfo *indxinfo, int enc,
18904
+ appendIndexCollationVersion(PQExpBuffer buffer, const IndxInfo *indxinfo,
18907
18905
bool coll_unknown, Archive *fout)
18908
18906
{
18909
18907
char *inddependcollnames = indxinfo->inddependcollnames;
0 commit comments